@@ -49,9 +49,11 @@ pipeline {
49
49
if [[ $(git show -s --format='%s%n%b' "${LHS}..${RHS}") =~ LINT-FULL ]]
50
50
then find hubblestack -name "*.py"
51
51
else find hubblestack -name "*.py" -print0 | xargs -r0 git diff --name-only "$LHS" "$RHS"
52
- fi > tests/unittests/output/ relevant-files.txt
52
+ fi > relevant-files.txt
53
53
'''
54
- sh '''mkdir -vp tests/unittests/output'''
54
+ sh '''mkdir -vp tests/unittests/output
55
+ cp relevant-files.txt tests/unittests/output
56
+ '''
55
57
}
56
58
}
57
59
stage('lint/test') {
@@ -71,9 +73,14 @@ pipeline {
71
73
steps {
72
74
sh '''#!/bin/bash
73
75
source ./venv/bin/activate
74
- < tests/unittests/output/relevant-files.txt xargs -r pylint --output-format=json \
75
- > tests/unittests/output/pylint.json
76
- x=$?
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
77
84
python ./tests/automation/pylint-json-to-html tests/unittests/output/pylint.json
78
85
exit $x
79
86
'''
@@ -84,12 +91,17 @@ pipeline {
84
91
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
85
92
sh '''#!/bin/bash
86
93
source ./venv/bin/activate
87
- < tests/unittests/output/relevant-files.txt xargs -r bandit -lif html \
88
- > tests/unittests/output/bandit.html
89
- x=$?
90
- cp tests/static/bandit.css tests/unittests/output/bandit.css
91
- sed -i -e '/<style/,/<.style/c<link rel="stylesheet" href="bandit.css">' \
92
- tests/unittests/output/bandit.html
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
93
105
exit $x
94
106
'''
95
107
}
0 commit comments