Skip to content

Commit ce07a3c

Browse files
authored
HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7209)
1 parent c579d06 commit ce07a3c

3 files changed

Lines changed: 26 additions & 16 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ jobs:
169169
- build-info
170170
- build
171171
- basic
172+
- dependency
173+
- license
172174
timeout-minutes: 45
173175
if: needs.build-info.outputs.needs-compile == 'true'
174176
strategy:
@@ -410,6 +412,8 @@ jobs:
410412
- build-info
411413
- build
412414
- basic
415+
- dependency
416+
- license
413417
runs-on: ubuntu-20.04
414418
timeout-minutes: 150
415419
if: needs.build-info.outputs.needs-compose-tests == 'true'
@@ -457,6 +461,8 @@ jobs:
457461
- build-info
458462
- build
459463
- basic
464+
- dependency
465+
- license
460466
runs-on: ubuntu-20.04
461467
timeout-minutes: 60
462468
if: needs.build-info.outputs.needs-kubernetes-tests == 'true'

dev-support/ci/selective_ci_checks.bats

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ load bats-assert/load.bash
5252
assert_output -p needs-build=true
5353
assert_output -p needs-compile=false
5454
assert_output -p needs-compose-tests=true
55-
assert_output -p needs-dependency-check=false
55+
assert_output -p needs-dependency-check=true
5656
assert_output -p needs-integration-tests=false
5757
assert_output -p needs-kubernetes-tests=false
5858
}
@@ -76,7 +76,7 @@ load bats-assert/load.bash
7676
assert_output -p needs-build=true
7777
assert_output -p needs-compile=false
7878
assert_output -p needs-compose-tests=true
79-
assert_output -p needs-dependency-check=false
79+
assert_output -p needs-dependency-check=true
8080
assert_output -p needs-integration-tests=false
8181
assert_output -p needs-kubernetes-tests=true
8282
}
@@ -100,7 +100,7 @@ load bats-assert/load.bash
100100
assert_output -p needs-build=true
101101
assert_output -p needs-compile=false
102102
assert_output -p needs-compose-tests=true
103-
assert_output -p needs-dependency-check=false
103+
assert_output -p needs-dependency-check=true
104104
assert_output -p needs-integration-tests=false
105105
assert_output -p needs-kubernetes-tests=true
106106
}
@@ -112,7 +112,7 @@ load bats-assert/load.bash
112112
assert_output -p needs-build=true
113113
assert_output -p needs-compile=true
114114
assert_output -p needs-compose-tests=false
115-
assert_output -p needs-dependency-check=false
115+
assert_output -p needs-dependency-check=true
116116
assert_output -p needs-integration-tests=true
117117
assert_output -p needs-kubernetes-tests=false
118118
}
@@ -136,7 +136,7 @@ load bats-assert/load.bash
136136
assert_output -p needs-build=true
137137
assert_output -p needs-compile=true
138138
assert_output -p needs-compose-tests=false
139-
assert_output -p needs-dependency-check=false
139+
assert_output -p needs-dependency-check=true
140140
assert_output -p needs-integration-tests=true
141141
assert_output -p needs-kubernetes-tests=false
142142
}
@@ -148,7 +148,7 @@ load bats-assert/load.bash
148148
assert_output -p needs-build=true
149149
assert_output -p needs-compile=true
150150
assert_output -p needs-compose-tests=false
151-
assert_output -p needs-dependency-check=false
151+
assert_output -p needs-dependency-check=true
152152
assert_output -p needs-integration-tests=true
153153
assert_output -p needs-kubernetes-tests=false
154154
}
@@ -160,7 +160,7 @@ load bats-assert/load.bash
160160
assert_output -p needs-build=true
161161
assert_output -p needs-compile=true
162162
assert_output -p needs-compose-tests=false
163-
assert_output -p needs-dependency-check=false
163+
assert_output -p needs-dependency-check=true
164164
assert_output -p needs-integration-tests=true
165165
assert_output -p needs-kubernetes-tests=false
166166
}
@@ -172,7 +172,7 @@ load bats-assert/load.bash
172172
assert_output -p needs-build=true
173173
assert_output -p needs-compile=true
174174
assert_output -p needs-compose-tests=false
175-
assert_output -p needs-dependency-check=false
175+
assert_output -p needs-dependency-check=true
176176
assert_output -p needs-integration-tests=true
177177
assert_output -p needs-kubernetes-tests=false
178178
}
@@ -184,7 +184,7 @@ load bats-assert/load.bash
184184
assert_output -p needs-build=true
185185
assert_output -p needs-compile=true
186186
assert_output -p needs-compose-tests=false
187-
assert_output -p needs-dependency-check=false
187+
assert_output -p needs-dependency-check=true
188188
assert_output -p needs-integration-tests=false
189189
assert_output -p needs-kubernetes-tests=false
190190
}
@@ -196,7 +196,7 @@ load bats-assert/load.bash
196196
assert_output -p needs-build=true
197197
assert_output -p needs-compile=true
198198
assert_output -p needs-compose-tests=false
199-
assert_output -p needs-dependency-check=false
199+
assert_output -p needs-dependency-check=true
200200
assert_output -p needs-integration-tests=false
201201
assert_output -p needs-kubernetes-tests=false
202202
}
@@ -208,7 +208,7 @@ load bats-assert/load.bash
208208
assert_output -p needs-build=true
209209
assert_output -p needs-compile=false
210210
assert_output -p needs-compose-tests=false
211-
assert_output -p needs-dependency-check=false
211+
assert_output -p needs-dependency-check=true
212212
assert_output -p needs-integration-tests=false
213213
assert_output -p needs-kubernetes-tests=true
214214
}
@@ -232,7 +232,7 @@ load bats-assert/load.bash
232232
assert_output -p needs-build=true
233233
assert_output -p needs-compile=true
234234
assert_output -p needs-compose-tests=true
235-
assert_output -p needs-dependency-check=false
235+
assert_output -p needs-dependency-check=true
236236
assert_output -p needs-integration-tests=true
237237
assert_output -p needs-kubernetes-tests=true
238238
}
@@ -244,7 +244,7 @@ load bats-assert/load.bash
244244
assert_output -p needs-build=true
245245
assert_output -p needs-compile=true
246246
assert_output -p needs-compose-tests=true
247-
assert_output -p needs-dependency-check=false
247+
assert_output -p needs-dependency-check=true
248248
assert_output -p needs-integration-tests=true
249249
assert_output -p needs-kubernetes-tests=true
250250
}
@@ -256,7 +256,7 @@ load bats-assert/load.bash
256256
assert_output -p needs-build=true
257257
assert_output -p needs-compile=true
258258
assert_output -p needs-compose-tests=true
259-
assert_output -p needs-dependency-check=false
259+
assert_output -p needs-dependency-check=true
260260
assert_output -p needs-integration-tests=true
261261
assert_output -p needs-kubernetes-tests=true
262262
}
@@ -268,7 +268,7 @@ load bats-assert/load.bash
268268
assert_output -p needs-build=true
269269
assert_output -p needs-compile=true
270270
assert_output -p needs-compose-tests=true
271-
assert_output -p needs-dependency-check=false
271+
assert_output -p needs-dependency-check=true
272272
assert_output -p needs-integration-tests=true
273273
assert_output -p needs-kubernetes-tests=true
274274
}

dev-support/ci/selective_ci_checks.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ function check_needs_compile() {
330330

331331
if [[ ${match_count} != "0" ]]; then
332332
compile_needed=true
333+
dependency_check_needed=true
333334
fi
334335

335336
start_end::group_end
@@ -520,19 +521,22 @@ function calculate_test_types_to_run() {
520521
echo "Looks like ${COUNT_CORE_OTHER_CHANGED_FILES} core files changed, running all tests."
521522
echo
522523
compose_tests_needed=true
524+
dependency_check_needed=true
523525
integration_tests_needed=true
524526
kubernetes_tests_needed=true
525527
else
526528
echo "All ${COUNT_ALL_CHANGED_FILES} changed files are known to be handled by specific checks."
527529
echo
528530
if [[ ${COUNT_COMPOSE_CHANGED_FILES} != "0" ]] || [[ ${COUNT_ROBOT_CHANGED_FILES} != "0" ]]; then
529531
compose_tests_needed="true"
532+
dependency_check_needed=true
530533
fi
531534
if [[ ${COUNT_INTEGRATION_CHANGED_FILES} != "0" ]]; then
532535
integration_tests_needed="true"
533536
fi
534537
if [[ ${COUNT_KUBERNETES_CHANGED_FILES} != "0" ]] || [[ ${COUNT_ROBOT_CHANGED_FILES} != "0" ]]; then
535538
kubernetes_tests_needed="true"
539+
dependency_check_needed=true
536540
fi
537541
fi
538542
start_end::group_end
@@ -590,14 +594,14 @@ get_count_robot_files
590594
get_count_misc_files
591595

592596
check_needs_build
597+
check_needs_dependency
593598
check_needs_compile
594599

595600
# calculate basic checks to run
596601
BASIC_CHECKS="rat"
597602
check_needs_author
598603
check_needs_bats
599604
check_needs_checkstyle
600-
check_needs_dependency
601605
check_needs_docs
602606
check_needs_findbugs
603607
check_needs_native

0 commit comments

Comments
 (0)