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

Add RHEL 9.3 and 8.9 GA to pipeline

Browse source
This commit is contained in:
Tom Koscielniak 2024-01-12 15:37:34 +01:00 • committed by tkoscieln
parent b461b1faf3
commit d97f54cc5c
3 changed files with 61 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

66
.gitlab-ci.yml
View file

@ -104,10 +104,10 @@ RPM:
- aws/fedora-40-aarch64 - aws/fedora-40-aarch64
- aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8.4-ga-aarch64 - aws/rhel-8.4-ga-aarch64
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
- aws/rhel-8.8-ga-aarch64 - aws/rhel-8.9-ga-aarch64
- aws/rhel-9.2-ga-x86_64 - aws/rhel-9.3-ga-x86_64
- aws/rhel-9.2-ga-aarch64 - aws/rhel-9.3-ga-aarch64
- aws/centos-stream-8-x86_64 - aws/centos-stream-8-x86_64
- aws/centos-stream-8-aarch64 - aws/centos-stream-8-aarch64
- aws/centos-stream-9-x86_64 - aws/centos-stream-9-x86_64
@ -139,7 +139,7 @@ Container:
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
Packer: Packer:
stage: test stage: test
@ -149,7 +149,7 @@ Packer:
script: script:
- tools/ci-build-worker-packer.sh - tools/ci-build-worker-packer.sh
variables: variables:
RUNNER: aws/rhel-9.2-ga-x86_64 RUNNER: aws/rhel-9.3-ga-x86_64
Prepare-rhel-internal: Prepare-rhel-internal:
stage: prepare-rhel-internal stage: prepare-rhel-internal
@ -190,10 +190,10 @@ Base:
- aws/fedora-39-aarch64 - aws/fedora-39-aarch64
- aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8.4-ga-aarch64 - aws/rhel-8.4-ga-aarch64
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
- aws/rhel-8.8-ga-aarch64 - aws/rhel-8.9-ga-aarch64
- aws/rhel-9.2-ga-x86_64 - aws/rhel-9.3-ga-x86_64
- aws/rhel-9.2-ga-aarch64 - aws/rhel-9.3-ga-aarch64
- aws/centos-stream-8-x86_64 - aws/centos-stream-8-x86_64
- aws/centos-stream-8-aarch64 - aws/centos-stream-8-aarch64
- RUNNER: - RUNNER:
@ -226,10 +226,10 @@ Base:
- RUNNER: - RUNNER:
- aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8.4-ga-aarch64 - aws/rhel-8.4-ga-aarch64
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
- aws/rhel-8.8-ga-aarch64 - aws/rhel-8.9-ga-aarch64
- aws/rhel-9.2-ga-x86_64 - aws/rhel-9.3-ga-x86_64
- aws/rhel-9.2-ga-aarch64 - aws/rhel-9.3-ga-aarch64
- aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-x86_64
- aws/rhel-8.10-nightly-aarch64 - aws/rhel-8.10-nightly-aarch64
- aws/rhel-9.4-nightly-x86_64 - aws/rhel-9.4-nightly-x86_64
@ -287,8 +287,8 @@ regression-old-worker-new-composer:
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
- aws/rhel-9.2-ga-x86_64 - aws/rhel-9.3-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
extends: .regression extends: .regression
variables: variables:
@ -356,8 +356,8 @@ Trigger-rhel-edge-ci:
RUNNER: RUNNER:
- aws/centos-stream-8-x86_64 - aws/centos-stream-8-x86_64
- aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
- aws/rhel-9.2-ga-x86_64 - aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-x86_64
- aws/rhel-8.10-nightly-aarch64 - aws/rhel-8.10-nightly-aarch64
- aws/rhel-9.4-nightly-x86_64 - aws/rhel-9.4-nightly-x86_64
@ -401,19 +401,19 @@ koji.sh (cloud upload):
matrix: matrix:
- RUNNER: - RUNNER:
# Brew workers use RHEL-8.7 # Brew workers use RHEL-8.7
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-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:
# Brew workers use RHEL-8.6 # Brew workers use RHEL-8.6
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-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:
# Brew workers use RHEL-8.6 # Brew workers use RHEL-8.6
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: gcp CLOUD_TARGET: gcp
IMAGE_TYPE: gcp-rhui IMAGE_TYPE: gcp-rhui
@ -527,8 +527,8 @@ API:
matrix: matrix:
- <<: *API_TESTS - <<: *API_TESTS
RUNNER: RUNNER:
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
- aws/rhel-9.2-ga-x86_64 - aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-x86_64
- aws/rhel-9.4-nightly-x86_64 - aws/rhel-9.4-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
@ -538,8 +538,8 @@ API:
- aws/fedora-39-x86_64 - aws/fedora-39-x86_64
- IMAGE_TYPE: ["aws"] - IMAGE_TYPE: ["aws"]
RUNNER: RUNNER:
- aws/rhel-8.8-ga-aarch64 - aws/rhel-8.9-ga-aarch64
- aws/rhel-9.2-ga-aarch64 - aws/rhel-9.3-ga-aarch64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
API-module-hotfixes: API-module-hotfixes:
@ -557,14 +557,14 @@ API-module-hotfixes:
- IMAGE_TYPE: - IMAGE_TYPE:
- aws - aws
RUNNER: RUNNER:
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
- aws/rhel-8.8-ga-aarch64 - aws/rhel-8.9-ga-aarch64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
TEST_MODULE_HOTFIXES: [1] TEST_MODULE_HOTFIXES: [1]
- IMAGE_TYPE: - IMAGE_TYPE:
- vsphere - vsphere
RUNNER: RUNNER:
- aws/rhel-8.8-ga-x86_64 - aws/rhel-8.9-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
TEST_MODULE_HOTFIXES: [1] TEST_MODULE_HOTFIXES: [1]
@ -624,8 +624,8 @@ API-distro-alias:
# - rhos-01/fedora-39-x86_64 # - rhos-01/fedora-39-x86_64
- RUNNER: - RUNNER:
- gcp/centos-stream-8-x86_64 - gcp/centos-stream-8-x86_64
- gcp/rhel-8.8-ga-x86_64 - gcp/rhel-8.9-ga-x86_64
- gcp/rhel-9.2-ga-x86_64 - gcp/rhel-9.3-ga-x86_64
- gcp/rhel-8.10-nightly-x86_64 - gcp/rhel-8.10-nightly-x86_64
- gcp/rhel-9.4-nightly-x86_64 - gcp/rhel-9.4-nightly-x86_64
- gcp/centos-stream-9-x86_64 - gcp/centos-stream-9-x86_64
@ -646,7 +646,7 @@ ubi-wsl.sh:
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/ubi-wsl.sh - /usr/libexec/tests/osbuild-composer/ubi-wsl.sh
variables: variables:
RUNNER: aws/rhel-8.8-ga-x86_64 RUNNER: aws/rhel-8.9-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
weldr-distro-dot-notation+aliases: weldr-distro-dot-notation+aliases:
@ -701,7 +701,7 @@ RHEL 9 on 8:
- 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-8.8-ga-x86_64 RUNNER: aws/rhel-8.9-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
DISTRO_CODE: rhel-91 DISTRO_CODE: rhel-91
@ -715,7 +715,7 @@ Multi-tenancy:
- /usr/libexec/tests/osbuild-composer/multi-tenancy.sh - /usr/libexec/tests/osbuild-composer/multi-tenancy.sh
variables: variables:
# only 8.7 GA b/c the Image Builder service runs on RHEL 8 # only 8.7 GA b/c the Image Builder service runs on RHEL 8
RUNNER: aws/rhel-8.8-ga-x86_64 RUNNER: aws/rhel-8.9-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
OpenSCAP: OpenSCAP:

38
Schutzfile
View file

@ -2,7 +2,7 @@
"fedora-38": { "fedora-38": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
}, },
"repos": [ "repos": [
@ -79,7 +79,7 @@
"fedora-39": { "fedora-39": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
}, },
"repos": [ "repos": [
@ -122,7 +122,7 @@
"fedora-40": { "fedora-40": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
}, },
"repos": [ "repos": [
@ -148,14 +148,21 @@
"rhel-8.4": { "rhel-8.4": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
} }
}, },
"rhel-8.8": { "rhel-8.8": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
}
}
},
"rhel-8.9": {
"dependencies": {
"osbuild": {
"commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
} }
}, },
@ -169,7 +176,7 @@
"rhel-8.10": { "rhel-8.10": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
}, },
"repos": [ "repos": [
@ -215,7 +222,14 @@
"rhel-9.2": { "rhel-9.2": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
}
}
},
"rhel-9.3": {
"dependencies": {
"osbuild": {
"commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
} }
}, },
@ -229,7 +243,7 @@
"rhel-9.4": { "rhel-9.4": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
}, },
"repos": [ "repos": [
@ -275,21 +289,21 @@
"centos-8": { "centos-8": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
} }
}, },
"centos-9": { "centos-9": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
} }
}, },
"centos-stream-9": { "centos-stream-9": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
}, },
"repos": [ "repos": [
@ -335,7 +349,7 @@
"centos-stream-8": { "centos-stream-8": {
"dependencies": { "dependencies": {
"osbuild": { "osbuild": {
"commit": "5fc3b565a257b0e0636d9e7f0015fc7f6cae0e55" "commit": "106681f41e8359e7b2bd1f0e091e48ec32f3b61d"
} }
}, },
"repos": [ "repos": [

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

@ -13,9 +13,9 @@ ARTIFACTS="${ARTIFACTS:-/tmp/artifacts}"
source /usr/libexec/osbuild-composer-test/set-env-variables.sh source /usr/libexec/osbuild-composer-test/set-env-variables.sh
source /usr/libexec/tests/osbuild-composer/shared_lib.sh source /usr/libexec/tests/osbuild-composer/shared_lib.sh
# Only run this on x86 and rhel8 GA # Only run this on x86
if [ "$ARCH" != "x86_64" ] || [ "$ID" != rhel ] || ! sudo subscription-manager status; then if [ "$ARCH" != "x86_64" ] || [ "$ID" != rhel ] || ! sudo subscription-manager status; then
echo "Test only supported on GA RHEL." echo "Test only supported on RHEL x86_64."
exit 1 exit 1
fi fi