1
diff --git a/.launchpad.yaml b/.launchpad.yaml
2
0
old mode 100755
0
old mode 100755
3
1
new mode 100644
1
new mode 100644
4
index ee74e0f..9befb4f
5
--- a/.launchpad.yaml
6
+++ b/.launchpad.yaml
7
@@ -42,8 +42,3 @@ jobs:
8
42
      - name: charmcraft
42
      - name: charmcraft
9
43
        classic: true
43
        classic: true
10
44
    run: ./ci/build_charms
44
    run: ./ci/build_charms
11
45
  lint_test:
12
46
    series: focal
13
47
    architectures: amd64
14
48
    packages: [pylint, python3, shellcheck, yamllint]
15
49
    run: ./ci/lint_test
16
diff --git a/ci/lint_test b/ci/lint_test
17
50
deleted file mode 100755
45
deleted file mode 100755
18
index 3fee7f5..0000000
19
--- a/ci/lint_test
20
+++ /dev/null
21
@@ -1,133 +0,0 @@
22
1
#!/usr/bin/python3
23
2
# pylint: disable = invalid-name, broad-except, subprocess-run-check
24
3
"""
25
4
Script to lint the scripts in the autopkgtest-cloud repository in CI
26
5
"""
27
6
import logging
28
7
import os
29
8
import pathlib
30
9
import subprocess
31
10
import sys
32
11
33
12
34
13
def check_for_extension(input_list, output_list, extension):
35
14
    """
36
15
    Checks filepaths in a list for a given extension
37
16
    """
38
17
    for a in input_list:
39
18
        if os.path.isfile(a):
40
19
            # if str(a)[-3:] == extension:
41
20
            if extension in str(a)[-6:]:
42
21
                output_list.append(str(a))
43
22
    return output_list
44
23
45
24
46
25
def check_for_shebang(input_list, output_list, shebang):
47
26
    """
48
27
    Checks filepaths in a given list for a given shebang
49
28
    """
50
29
    for b in input_list:
51
30
        if os.path.isfile(b):
52
31
            try:
53
32
                with open(b, "r", encoding="utf-8") as myfile:
54
33
                    file = myfile.read()
55
34
                    into_list = file.splitlines()
56
35
                    if len(into_list) > 1:
57
36
                        if into_list[0] == shebang:
58
37
                            output_list.append(str(b))
59
38
            except Exception as _:
60
39
                pass
61
40
    return output_list
62
41
63
42
64
43
def remove_list_from_list(input_list, remove_list):
65
44
    """
66
45
    Removes elements from remove_list from input_list
67
46
    """
68
47
    for ff in input_list:
69
48
        if os.path.isfile(ff):
70
49
            if str(ff) in remove_list:
71
50
                input_list.remove(ff)
72
51
    return input_list
73
52
74
53
75
54
def run_lint_command(files_to_lint, lint_command, arguments=None):
76
55
    """
77
56
    Runs a given lint command over a list of filepaths and stores output
78
57
    and exit code
79
58
    """
80
59
    exit_codes = 0
81
60
    lint_output = ""
82
61
    # check lint command exists
83
62
    for f in files_to_lint:
84
63
        if arguments is None:
85
64
            cmd = [lint_command, f]
86
65
            result = subprocess.run(cmd, stdout=subprocess.PIPE)
87
66
        else:
88
67
            cmd = [lint_command]
89
68
            for arg in arguments.split(" "):
90
69
                cmd.append(arg)
91
70
            cmd.append(f)
92
71
            result = subprocess.run(cmd, stdout=subprocess.PIPE)
93
72
        lint_output += result.stdout.decode("utf-8") + "\n"
94
73
        exit_codes += result.returncode
95
74
    return lint_output, exit_codes
96
75
97
76
98
77
if __name__ == "__main__":
99
78
    logging.basicConfig(level=logging.INFO)
100
79
    logger = logging.getLogger("autopkgtest-cloud-linter")
101
80
102
81
    start_dir = "../"
103
82
    repo_dir = pathlib.Path(start_dir)
104
83
    repo_dir.rglob("*")
105
84
106
85
    final_list_of_python_files = []
107
86
    all_files = list(repo_dir.rglob("*"))
108
87
109
88
    data = {
110
89
        "pylint": {
111
90
            "files": [],
112
91
            "extensions": [".py"],
113
92
            "shebangs": ["#!/usr/bin/python3"],
114
93
            "args": None,
115
94
            "output": "",
116
95
            "code": 0,
117
96
        },
118
97
    }
119
98
120
99
    for key, item in data.items():
121
100
        if item["extensions"] is not None:
122
101
            for extension in item["extensions"]:
123
102
                data[key]["files"] = check_for_extension(
124
103
                    all_files, data[key]["files"], extension
125
104
                )
126
105
                all_files = remove_list_from_list(
127
106
                    all_files, data[key]["files"]
128
107
                )
129
108
        if item["shebangs"] is not None:
130
109
            for shebang in item["shebangs"]:
131
110
                data[key]["files"] = check_for_shebang(
132
111
                    all_files, data[key]["files"], shebang
133
112
                )
134
113
                all_files = remove_list_from_list(
135
114
                    all_files, data[key]["files"]
136
115
                )
137
116
        data[key]["output"], data[key]["code"] = run_lint_command(
138
117
            data[key]["files"], key, data[key]["args"]
139
118
        )
140
119
    ecodesum = 0
141
120
    for _, oec in data.items():
142
121
        ecodesum += oec["code"]
143
122
    if ecodesum > 0:
144
123
        for key, item in data.items():
145
124
            if item["code"] > 0:
146
125
                # logger.info("%s output: \n%s", key, item["output"])
147
126
                logger.info("%s failed!", key)
148
127
        # sys.exit(1)
149
128
        # temporary exit code, will be set back to 1 when python and bash scripts have been linted
150
129
        # right now we are just checking yaml files
151
130
        if key == "yamllint" and item["code"] != 0:
152
131
            sys.exit(1)
153
132
        sys.exit(0)
154
133
    sys.exit(0)
Status:	Merged
Approved by:	Tim Andersson on 2023-06-30
Approved revision:	10438fa34380da0ae9a6dc7aba9d219e3cfa5dd6
Merged at revision:	10438fa34380da0ae9a6dc7aba9d219e3cfa5dd6
Proposed branch:	~paride/autopkgtest-cloud:ci_drop_lint_test
Merge into:	autopkgtest-cloud:master
Diff against target:	154 lines (+0/-138) 2 files modified .launchpad.yaml (+0/-5) dev/null (+0/-133)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Tim Andersson		2023-06-30	Approve on 2023-06-30
Review via email: mp+445774@code.launchpad.net