Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jobs/build: add support for stream level skip_kola_tags knob #1008

Merged
merged 1 commit into from
Jun 21, 2024
+22 −7
Merged

jobs/build: add support for stream level skip_kola_tags knob #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ streams:
COSA_USE_OSBUILD: true
# OPTIONAL: require kernel + kernel-rt versions to match
check_kernel_rt_mismatch_rhcos: true
# OPTIONAL: list of kola tags to skip for this stream
skip_kola_tags: [openshift, needs-internet, luks]

# REQUIRED: architectures to build for other than x86_64
additional_arches: [aarch64, ppc64le, s390x]
Expand Down
3 changes: 2 additions & 1 deletion jobs/build-arch.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion jobs/build.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion jobs/bump-lockfile.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
12 changes: 8 additions & 4 deletions jobs/kola-aws.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)
}
}

Expand Down
1 change: 1 addition & 0 deletions jobs/kola-azure.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ cosaPod(memory: "${cosa_memory_request_mb}Mi", kvm: false,
build: params.VERSION, arch: params.ARCH,
extraArgs: params.KOLA_TESTS,
skipUpgrade: true,
skipKolaTags: stream_info.skip_kola_tags,
platformArgs: """-p=azure \
--azure-credentials \${AZURE_KOLA_TESTS_CONFIG} \
--azure-location $region \
Expand Down
2 changes: 2 additions & 0 deletions jobs/kola-gcp.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ cosaPod(memory: "512Mi", kvm: false,
kola(cosaDir: env.WORKSPACE, parallel: 5,
build: params.VERSION, arch: params.ARCH,
extraArgs: params.KOLA_TESTS,
skipKolaTags: stream_info.skip_kola_tags,
platformArgs: """-p=gcp \
--gcp-json-key=\${GCP_KOLA_TESTS_CONFIG} \
--gcp-project=${gcp_project}""")
Expand All @@ -97,6 +98,7 @@ cosaPod(memory: "512Mi", kvm: false,
build: params.VERSION, arch: params.ARCH,
extraArgs: confidential_tests,
skipUpgrade: true,
skipKolaTags: stream_info.skip_kola_tags,
marker: "confidential",
platformArgs: """-p=gcp \
--gcp-json-key=\${GCP_KOLA_TESTS_CONFIG} \
Expand Down
1 change: 1 addition & 0 deletions jobs/kola-kubernetes.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}

Expand Down
1 change: 1 addition & 0 deletions jobs/kola-openstack.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions jobs/kola-upgrade.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down