Skip to content

Commit 2f6efa4

Browse files
committed
utils: check for cloud images in specific arch build
Otherwise, it'll check `x86_64` if that build metadata happens to be available, but we may be triggering a cloud test for another arch (as with `fix-build`).
1 parent 24222fd commit 2f6efa4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

utils.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ def run_cloud_tests(pipecfg, stream, version, cosa, basearch, commit) {
507507
string(name: 'SRC_CONFIG_COMMIT', value: commit)]
508508

509509
// Kick off the Kola AWS job if we have an uploaded image, credentials, and testing is enabled.
510-
if (shwrapCapture("cosa meta --build=${version} --get-value amis") != "None" &&
510+
if (shwrapCapture("cosa meta --build=${version} --arch=${basearch} --get-value amis") != "None" &&
511511
cloud_testing_enabled_for_arch(pipecfg, 'aws', basearch) &&
512512
utils.credentialsExist([file(variable: 'AWS_KOLA_TESTS_CONFIG',
513513
credentialsId: 'aws-kola-tests-config')])) {
@@ -518,23 +518,23 @@ def run_cloud_tests(pipecfg, stream, version, cosa, basearch, commit) {
518518
}
519519

520520
// Kick off the Kola Azure job if we have an artifact, credentials, and testing is enabled.
521-
if (shwrapCapture("cosa meta --build=${version} --get-value images.azure") != "None" &&
521+
if (shwrapCapture("cosa meta --build=${version} --arch=${basearch} --get-value images.azure") != "None" &&
522522
cloud_testing_enabled_for_arch(pipecfg, 'azure', basearch) &&
523523
utils.credentialsExist([file(variable: 'AZURE_KOLA_TESTS_CONFIG',
524524
credentialsId: 'azure-kola-tests-config')])) {
525525
testruns['Kola:Azure'] = { build job: 'kola-azure', wait: false, parameters: params }
526526
}
527527

528528
// Kick off the Kola GCP job if we have an uploaded image, credentials, and testing is enabled.
529-
if (shwrapCapture("cosa meta --build=${version} --get-value gcp") != "None" &&
529+
if (shwrapCapture("cosa meta --build=${version} --arch=${basearch} --get-value gcp") != "None" &&
530530
cloud_testing_enabled_for_arch(pipecfg, 'gcp', basearch) &&
531531
utils.credentialsExist([file(variable: 'GCP_KOLA_TESTS_CONFIG',
532532
credentialsId: 'gcp-kola-tests-config')])) {
533533
testruns['Kola:GCP'] = { build job: 'kola-gcp', wait: false, parameters: params }
534534
}
535535

536536
// Kick off the Kola OpenStack job if we have an artifact, credentials, and testing is enabled.
537-
if (shwrapCapture("cosa meta --build=${version} --get-value images.openstack") != "None" &&
537+
if (shwrapCapture("cosa meta --build=${version} --arch=${basearch} --get-value images.openstack") != "None" &&
538538
cloud_testing_enabled_for_arch(pipecfg, 'openstack', basearch) &&
539539
utils.credentialsExist([file(variable: 'OPENSTACK_KOLA_TESTS_CONFIG',
540540
credentialsId: 'openstack-kola-tests-config')])) {

0 commit comments

Comments
 (0)