particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests/CI: Add runners for RHEL 9.6 GA and 10.0 GA

Browse source 
Add new GA runners and remove the old 9.5 GA runner. Remove repo overrides for new runners as well. Add a comment explaining why a regression-old-worker-new-composer test will fail when a new major version GA runner is added.
This commit is contained in:
Tom Koscielniak 2025-07-02 13:49:51 +02:00 • committed by Tomáš Koscielniak
parent dc66a845bc
commit d19d933fe8
3 changed files with 38 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

53
.gitlab-ci.yml
View file

@ -115,8 +115,10 @@ RPM:
- aws/fedora-42-aarch64 - aws/fedora-42-aarch64
- aws/rhel-8.10-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-8.10-ga-aarch64 - aws/rhel-8.10-ga-aarch64
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
- aws/rhel-9.5-ga-aarch64 - aws/rhel-9.6-ga-aarch64
- aws/rhel-10.0-ga-x86_64
- aws/rhel-10.0-ga-aarch64
- aws/centos-stream-9-x86_64 - aws/centos-stream-9-x86_64
- aws/centos-stream-9-aarch64 - aws/centos-stream-9-aarch64
- aws/centos-stream-10-x86_64 - aws/centos-stream-10-x86_64
@ -159,7 +161,7 @@ Packer:
script: script:
- tools/ci-build-worker-packer.sh - tools/ci-build-worker-packer.sh
variables: variables:
RUNNER: aws/rhel-9.5-ga-x86_64 RUNNER: aws/rhel-9.6-ga-x86_64
Prepare-rhel-internal: Prepare-rhel-internal:
stage: prepare-rhel-internal stage: prepare-rhel-internal
@ -199,8 +201,10 @@ Base:
- aws/fedora-41-aarch64 - aws/fedora-41-aarch64
- aws/rhel-8.10-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-8.10-ga-aarch64 - aws/rhel-8.10-ga-aarch64
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
- aws/rhel-9.5-ga-aarch64 - aws/rhel-9.6-ga-aarch64
- aws/rhel-10.0-ga-x86_64
- aws/rhel-10.0-ga-aarch64
- RUNNER: - RUNNER:
- aws/rhel-9.7-nightly-x86_64 - aws/rhel-9.7-nightly-x86_64
- aws/rhel-9.7-nightly-aarch64 - aws/rhel-9.7-nightly-aarch64
@ -230,8 +234,10 @@ Base:
- RUNNER: - RUNNER:
- aws/rhel-8.10-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-8.10-ga-aarch64 - aws/rhel-8.10-ga-aarch64
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
- aws/rhel-9.5-ga-aarch64 - aws/rhel-9.6-ga-aarch64
- aws/rhel-10.0-ga-x86_64
- aws/rhel-10.0-ga-aarch64
- aws/rhel-9.7-nightly-x86_64 - aws/rhel-9.7-nightly-x86_64
- aws/rhel-9.7-nightly-aarch64 - aws/rhel-9.7-nightly-aarch64
- aws/rhel-10.1-nightly-x86_64 - aws/rhel-10.1-nightly-x86_64
@ -286,7 +292,8 @@ regression-old-worker-new-composer:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-8.10-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
- aws/rhel-10.0-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
extends: .regression extends: .regression
variables: variables:
@ -359,7 +366,8 @@ Image Tests:
.rhel_runners: &rhel_runners .rhel_runners: &rhel_runners
RUNNER: RUNNER:
- aws/rhel-8.10-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
- aws/rhel-10.0-ga-x86_64
- aws/rhel-9.7-nightly-x86_64 - aws/rhel-9.7-nightly-x86_64
- aws/rhel-10.1-nightly-x86_64 - aws/rhel-10.1-nightly-x86_64
- aws/centos-stream-9-x86_64 - aws/centos-stream-9-x86_64
@ -401,17 +409,17 @@ koji.sh (cloud upload):
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: aws CLOUD_TARGET: aws
IMAGE_TYPE: aws-rhui IMAGE_TYPE: aws-rhui
- RUNNER: - RUNNER:
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: azure CLOUD_TARGET: azure
IMAGE_TYPE: azure-rhui IMAGE_TYPE: azure-rhui
- RUNNER: - RUNNER:
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: gcp CLOUD_TARGET: gcp
IMAGE_TYPE: gcp-rhui IMAGE_TYPE: gcp-rhui
@ -428,7 +436,7 @@ koji.sh (cloudapi):
matrix: matrix:
- *fedora_runners - *fedora_runners
- RUNNER: - RUNNER:
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
aws.sh: aws.sh:
@ -534,7 +542,8 @@ filesystem.sh:
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
- CUSTOMIZATION_TYPE: "disk-plain" - CUSTOMIZATION_TYPE: "disk-plain"
RUNNER: RUNNER:
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
- aws/rhel-10.0-ga-x86_64
- aws/rhel-10.1-nightly-x86_64 - aws/rhel-10.1-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
- CUSTOMIZATION_TYPE: "disk-lvm" - CUSTOMIZATION_TYPE: "disk-lvm"
@ -582,7 +591,8 @@ API:
- <<: *API_TESTS - <<: *API_TESTS
RUNNER: RUNNER:
- aws/rhel-8.10-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
- aws/rhel-10.0-ga-x86_64
- aws/rhel-9.7-nightly-x86_64 - aws/rhel-9.7-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
# el10 for now supports only a subset of image types # el10 for now supports only a subset of image types
@ -605,7 +615,8 @@ API:
- IMAGE_TYPE: ["aws"] - IMAGE_TYPE: ["aws"]
RUNNER: RUNNER:
- aws/rhel-8.10-ga-aarch64 - aws/rhel-8.10-ga-aarch64
- aws/rhel-9.5-ga-aarch64 - aws/rhel-9.6-ga-aarch64
- aws/rhel-10.0-ga-aarch64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
API-module-hotfixes: API-module-hotfixes:
@ -651,7 +662,8 @@ API-module-hotfixes:
- rhos-01/fedora-42-x86_64 - rhos-01/fedora-42-x86_64
- RUNNER: - RUNNER:
- gcp/rhel-8.10-ga-x86_64 - gcp/rhel-8.10-ga-x86_64
- gcp/rhel-9.5-ga-x86_64 - gcp/rhel-9.6-ga-x86_64
- gcp/rhel-10.0-ga-x86_64
- gcp/rhel-9.7-nightly-x86_64 - gcp/rhel-9.7-nightly-x86_64
# TODO: replace the rhos-01 runner with this gcp runner once it's available # TODO: replace the rhos-01 runner with this gcp runner once it's available
# - gcp/rhel-10.0-nightly-x86_64 # - gcp/rhel-10.0-nightly-x86_64
@ -678,7 +690,8 @@ ubi-wsl.sh:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-8.10-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.5-ga-x86_64 - aws/rhel-9.6-ga-x86_64
- aws/rhel-10.0-ga-x86_64
- aws/rhel-10.1-nightly-x86_64 - aws/rhel-10.1-nightly-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
@ -737,7 +750,7 @@ RHEL 8 on 9 (Koji):
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/koji.sh - /usr/libexec/tests/osbuild-composer/koji.sh
variables: variables:
RUNNER: aws/rhel-9.5-ga-x86_64 RUNNER: aws/rhel-9.6-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
DISTRO_CODE: rhel-8.10 DISTRO_CODE: rhel-8.10
@ -751,7 +764,7 @@ RHEL 10 on 9 (Koji):
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/koji.sh - /usr/libexec/tests/osbuild-composer/koji.sh
variables: variables:
RUNNER: aws/rhel-9.5-ga-x86_64 RUNNER: aws/rhel-9.6-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
DISTRO_CODE: rhel-10.1 DISTRO_CODE: rhel-10.1

82
Schutzfile
View file

@ -146,46 +146,7 @@
"osbuild": { "osbuild": {
"commit": "d566c68f94f3fed0a91683f471e51b3dfcf2fdfa" "commit": "d566c68f94f3fed0a91683f471e51b3dfcf2fdfa"
} }
}, }
"repos": [
{
"file": "/etc/yum.repos.d/rhel9internal.repo",
"x86_64": [
{
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.6-20250626"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.6-20250626"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.6-20250626"
}
],
"aarch64": [
{
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.6-20250626"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.6-20250626"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.6-20250626"
}
]
}
]
}, },
"rhel-9.7": { "rhel-9.7": {
"dependencies": { "dependencies": {
@ -238,46 +199,7 @@
"osbuild": { "osbuild": {
"commit": "d566c68f94f3fed0a91683f471e51b3dfcf2fdfa" "commit": "d566c68f94f3fed0a91683f471e51b3dfcf2fdfa"
} }
}, }
"repos": [
{
"file": "/etc/yum.repos.d/rhel10internal.repo",
"x86_64": [
{
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-baseos-n10.0-20250626"
},
{
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.0-20250626"
},
{
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.0-20250626"
}
],
"aarch64": [
{
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.0-20250626"
},
{
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.0-20250626"
},
{
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.0-20250626"
}
]
}
]
}, },
"rhel-10.1": { "rhel-10.1": {
"dependencies": { "dependencies": {

3
test/cases/regression-old-worker-new-composer.sh
View file

@ -28,6 +28,9 @@ DESIRED_WORKER_RPM="osbuild-composer-worker-$((CURRENT_WORKER_VERSION - 3))"
# Get the commit hash of the worker version we want to test by comparing the # Get the commit hash of the worker version we want to test by comparing the
# tag for 2 versions back - since the current version might still be unreleased, # tag for 2 versions back - since the current version might still be unreleased,
# we subtract 3 from the current version. # we subtract 3 from the current version.
# WARNING - with introduction of a new major version, new `rhel-*-cdn` directory on S3 AWS bucket will be new as well
# that means it will lack the repositories built from commits tagged with previous versions,
# so you need to manually copy them there from directories for minor versions on the same S3 AWS bucket.
DESIRED_TAG_SHA=$(curl -s "https://api.github.com/repos/osbuild/osbuild-composer/git/ref/tags/v$((CURRENT_WORKER_VERSION-3))" | jq -r '.object.sha') DESIRED_TAG_SHA=$(curl -s "https://api.github.com/repos/osbuild/osbuild-composer/git/ref/tags/v$((CURRENT_WORKER_VERSION-3))" | jq -r '.object.sha')
DESIRED_COMMIT_SHA=$(curl -s "https://api.github.com/repos/osbuild/osbuild-composer/git/tags/$DESIRED_TAG_SHA" | jq -r '.object.sha') DESIRED_COMMIT_SHA=$(curl -s "https://api.github.com/repos/osbuild/osbuild-composer/git/tags/$DESIRED_TAG_SHA" | jq -r '.object.sha')