@@ -51,8 +51,8 @@ pipeline {
51
51
else find hubblestack -name "*.py" -print0 | xargs -r0 git diff --name-only "$LHS" "$RHS"
52
52
fi > relevant-files.txt
53
53
'''
54
- sh '''mkdir -vp tests/unittests/output
55
- cp relevant-files.txt tests/unittests/output
54
+ sh ''' mkdir -vp tests/unittests/output
55
+ cp relevant-files.txt tests/unittests/output
56
56
'''
57
57
}
58
58
}
@@ -73,14 +73,9 @@ pipeline {
73
73
steps {
74
74
sh '''#!/bin/bash
75
75
source ./venv/bin/activate
76
- if grep -q . relevant-files.txt; then
77
- < relevant-files.txt xargs -r pylint --output-format=json \
78
- > tests/unittests/output/pylint.json
79
- x=$?
80
- else
81
- echo "[]" > tests/unittests/output/pylint.json
82
- x=0
83
- fi
76
+ < relevant-files.txt xargs -r pylint --output-format=json \
77
+ > tests/unittests/output/pylint.json
78
+ x=$?
84
79
python ./tests/automation/pylint-json-to-html tests/unittests/output/pylint.json
85
80
exit $x
86
81
'''
@@ -91,17 +86,12 @@ pipeline {
91
86
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
92
87
sh '''#!/bin/bash
93
88
source ./venv/bin/activate
94
- if grep -q . relevant-files.txt; then
95
- < relevant-files.txt xargs -r bandit -lif html \
96
- > tests/unittests/output/bandit.html
97
- x=$?
98
- cp tests/static/bandit.css tests/unittests/output/bandit.css
99
- sed -i -e '/<style/,/<.style/c<link rel="stylesheet" href="bandit.css">' \
100
- tests/unittests/output/bandit.html
101
- else
102
- echo "<p>did not run</p>" > tests/unittests/output/bandit.html
103
- x=0
104
- fi
89
+ < relevant-files.txt xargs -r bandit -lif html \
90
+ > tests/unittests/output/bandit.html
91
+ x=$?
92
+ cp tests/static/bandit.css tests/unittests/output/bandit.css
93
+ sed -i -e '/<style/,/<.style/c<link rel="stylesheet" href="bandit.css">' \
94
+ tests/unittests/output/bandit.html
105
95
exit $x
106
96
'''
107
97
}
0 commit comments