Skip to content

Commit 9f2b9e6

Browse files
Remove all.sh --list-components detection
all.sh has supported --list-components since 2.17.0 and 2.16.10. We don't need a fancy message for antique branches anymore: the exception from the all.sh call returning a nonzero status will do.
1 parent 9ebb3ef commit 9f2b9e6

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

vars/common.groovy

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -158,30 +158,20 @@ def get_branch_information() {
158158

159159
for (platform in linux_platforms) {
160160
get_docker_image(platform)
161-
def all_sh_help = sh(
161+
available_all_sh_components[platform] = sh(
162162
script: docker_script(
163-
platform, "./tests/scripts/all.sh", "--help"
163+
platform, "./tests/scripts/all.sh", "--list-components"
164164
),
165165
returnStdout: true
166-
)
167-
if (all_sh_help.contains('list-components')) {
168-
available_all_sh_components[platform] = sh(
166+
).trim().split('\n')
167+
if (all_all_sh_components == []) {
168+
all_all_sh_components = sh(
169169
script: docker_script(
170-
platform, "./tests/scripts/all.sh", "--list-components"
170+
platform, "./tests/scripts/all.sh",
171+
"--list-all-components"
171172
),
172173
returnStdout: true
173174
).trim().split('\n')
174-
if (all_all_sh_components == []) {
175-
all_all_sh_components = sh(
176-
script: docker_script(
177-
platform, "./tests/scripts/all.sh",
178-
"--list-all-components"
179-
),
180-
returnStdout: true
181-
).trim().split('\n')
182-
}
183-
} else {
184-
error('Pre Test Checks failed: Base branch out of date. Please rebase')
185175
}
186176
}
187177
}

0 commit comments

Comments
 (0)