diff --git a/jobs/build-arch.Jenkinsfile b/jobs/build-arch.Jenkinsfile index e9505625..a73f3a93 100644 --- a/jobs/build-arch.Jenkinsfile +++ b/jobs/build-arch.Jenkinsfile @@ -305,7 +305,8 @@ lock(resource: "build-${params.STREAM}-${basearch}") { kola(cosaDir: env.WORKSPACE, parallel: n, arch: basearch, skipUpgrade: pipecfg.hacks?.skip_upgrade_tests, allowUpgradeFail: params.ALLOW_KOLA_UPGRADE_FAILURE, - skipSecureBoot: pipecfg.hotfix?.skip_secureboot_tests_hack) + skipSecureBoot: pipecfg.hotfix?.skip_secureboot_tests_hack, + skipKolaTags: stream_info.skip_kola_tags) } // Build the remaining artifacts diff --git a/jobs/build.Jenkinsfile b/jobs/build.Jenkinsfile index da92ecf4..0ce77a90 100644 --- a/jobs/build.Jenkinsfile +++ b/jobs/build.Jenkinsfile @@ -374,7 +374,8 @@ lock(resource: "build-${params.STREAM}") { kola(cosaDir: env.WORKSPACE, parallel: n, arch: basearch, skipUpgrade: pipecfg.hacks?.skip_upgrade_tests, allowUpgradeFail: params.ALLOW_KOLA_UPGRADE_FAILURE, - skipSecureBoot: pipecfg.hotfix?.skip_secureboot_tests_hack) + skipSecureBoot: pipecfg.hotfix?.skip_secureboot_tests_hack, + skipKolaTags: stream_info.skip_kola_tags) } // If desired let's go ahead and archive+fork the multi-arch jobs diff --git a/jobs/bump-lockfile.Jenkinsfile b/jobs/bump-lockfile.Jenkinsfile index 061fc514..80602e6a 100644 --- a/jobs/bump-lockfile.Jenkinsfile +++ b/jobs/bump-lockfile.Jenkinsfile @@ -220,7 +220,8 @@ lock(resource: "bump-lockfile") { } def n = ncpus - 1 // remove 1 for upgrade test kola(cosaDir: env.WORKSPACE, parallel: n, arch: arch, - marker: arch, allowUpgradeFail: params.ALLOW_KOLA_UPGRADE_FAILURE) + marker: arch, allowUpgradeFail: params.ALLOW_KOLA_UPGRADE_FAILURE, + skipKolaTags: stream_info.skip_kola_tags) stage("${arch}:Build Metal") { shwrap("cosa buildextend-metal") shwrap("cosa buildextend-metal4k") diff --git a/jobs/kola-aws.Jenkinsfile b/jobs/kola-aws.Jenkinsfile index dc21c4f2..e90d7d29 100644 --- a/jobs/kola-aws.Jenkinsfile +++ b/jobs/kola-aws.Jenkinsfile @@ -78,7 +78,8 @@ cosaPod(memory: "512Mi", kvm: false, build: params.VERSION, arch: params.ARCH, extraArgs: params.KOLA_TESTS, skipBasicScenarios: true, - platformArgs: '-p=aws --aws-region=us-east-1') + platformArgs: '-p=aws --aws-region=us-east-1', + skipKolaTags: stream_info.skip_kola_tags) } if (params.ARCH == "x86_64") { @@ -102,7 +103,8 @@ cosaPod(memory: "512Mi", kvm: false, extraArgs: xen_tests, skipUpgrade: true, marker: "xen", - platformArgs: '-p=aws --aws-region=us-east-1 --aws-type=i3.large') + platformArgs: '-p=aws --aws-region=us-east-1 --aws-type=i3.large', + skipKolaTags: stream_info.skip_kola_tags) } parallelruns['Kola:Intel-Ice-Lake'] = { // https://github.com/coreos/fedora-coreos-tracker/issues/1004 @@ -111,7 +113,8 @@ cosaPod(memory: "512Mi", kvm: false, extraArgs: tests, skipUpgrade: true, marker: "intel-ice-lake", - platformArgs: '-p=aws --aws-region=us-east-1 --aws-type=m6i.large') + platformArgs: '-p=aws --aws-region=us-east-1 --aws-type=m6i.large', + skipKolaTags: stream_info.skip_kola_tags) } } else if (params.ARCH == "aarch64") { def tests = params.KOLA_TESTS @@ -125,7 +128,8 @@ cosaPod(memory: "512Mi", kvm: false, extraArgs: tests, skipUpgrade: true, marker: "graviton3", - platformArgs: '-p=aws --aws-region=us-east-1 --aws-type=c7g.xlarge') + platformArgs: '-p=aws --aws-region=us-east-1 --aws-type=c7g.xlarge', + skipKolaTags: stream_info.skip_kola_tags) } } diff --git a/jobs/kola-azure.Jenkinsfile b/jobs/kola-azure.Jenkinsfile index 8ddd48b6..57ce6954 100644 --- a/jobs/kola-azure.Jenkinsfile +++ b/jobs/kola-azure.Jenkinsfile @@ -138,7 +138,8 @@ cosaPod(memory: "${cosa_memory_request_mb}Mi", kvm: false, platformArgs: """-p=azure \ --azure-credentials \${AZURE_KOLA_TESTS_CONFIG} \ --azure-location $region \ - --azure-disk-uri /subscriptions/${azure_subscription}/resourceGroups/${azure_testing_resource_group}/providers/Microsoft.Compute/images/${azure_image_name}""") + --azure-disk-uri /subscriptions/${azure_subscription}/resourceGroups/${azure_testing_resource_group}/providers/Microsoft.Compute/images/${azure_image_name}""", + skipKolaTags: stream_info.skip_kola_tags) } finally { parallel "Delete Image": { // Delete the image in Azure diff --git a/jobs/kola-gcp.Jenkinsfile b/jobs/kola-gcp.Jenkinsfile index 550350e8..05471ed2 100644 --- a/jobs/kola-gcp.Jenkinsfile +++ b/jobs/kola-gcp.Jenkinsfile @@ -80,7 +80,8 @@ cosaPod(memory: "512Mi", kvm: false, extraArgs: params.KOLA_TESTS, platformArgs: """-p=gcp \ --gcp-json-key=\${GCP_KOLA_TESTS_CONFIG} \ - --gcp-project=${gcp_project}""") + --gcp-project=${gcp_project}""", + skipKolaTags: stream_info.skip_kola_tags) } if (params.ARCH == "x86_64") { parallelruns['Kola:Confidential'] = { @@ -101,7 +102,8 @@ cosaPod(memory: "512Mi", kvm: false, platformArgs: """-p=gcp \ --gcp-json-key=\${GCP_KOLA_TESTS_CONFIG} \ --gcp-project=${gcp_project} \ - --gcp-confidential-vm""") + --gcp-confidential-vm""", + skipKolaTags: stream_info.skip_kola_tags) } } diff --git a/jobs/kola-kubernetes.Jenkinsfile b/jobs/kola-kubernetes.Jenkinsfile index 1147545e..cfcbe4f9 100644 --- a/jobs/kola-kubernetes.Jenkinsfile +++ b/jobs/kola-kubernetes.Jenkinsfile @@ -72,6 +72,7 @@ cosaPod(memory: "512Mi", kvm: false, build: params.VERSION, arch: params.ARCH, extraArgs: "--tag k8s", skipUpgrade: true, + skipKolaTags: stream_info.skip_kola_tags, platformArgs: '-p=aws --aws-region=us-east-1') } diff --git a/jobs/kola-openstack.Jenkinsfile b/jobs/kola-openstack.Jenkinsfile index a44ffb59..74f47b79 100644 --- a/jobs/kola-openstack.Jenkinsfile +++ b/jobs/kola-openstack.Jenkinsfile @@ -119,6 +119,7 @@ lock(resource: "kola-openstack-${params.ARCH}") { extraArgs: params.KOLA_TESTS, rerunSuccessArgs: "tags=all", skipUpgrade: true, + skipKolaTags: stream_info.skip_kola_tags, platformArgs: """-p=openstack \ --openstack-config-file=\${OPENSTACK_KOLA_TESTS_CONFIG} \ --openstack-flavor=v3-starter-4 \ diff --git a/jobs/kola-upgrade.Jenkinsfile b/jobs/kola-upgrade.Jenkinsfile index 913736c2..8c5884c3 100644 --- a/jobs/kola-upgrade.Jenkinsfile +++ b/jobs/kola-upgrade.Jenkinsfile @@ -186,6 +186,7 @@ EOF extraArgs: "--tag extended-upgrade --append-butane tmp/target_stream.bu", skipBasicScenarios: true, skipUpgrade: true, + skipKolaTags: pipecfg.streams[params.STREAM].skip_kola_tags, ] def k1, k2, k3