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

.gitlab-ci.yml: switch to rhel 8.10 and 9.4 GA

Browse source
This commit is contained in:
Sanne Raymaekers 2024-05-29 15:10:42 +02:00 • committed by Achilleas Koutsou
parent 6b09c59365
commit 6483a75971
2 changed files with 41 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

79
.gitlab-ci.yml
View file

@ -98,10 +98,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.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-8.9-ga-aarch64 - aws/rhel-8.10-ga-aarch64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
- aws/rhel-9.3-ga-aarch64 - aws/rhel-9.4-ga-aarch64
- aws/centos-stream-9-x86_64 - aws/centos-stream-9-x86_64
- aws/centos-stream-9-aarch64 - aws/centos-stream-9-aarch64
- <<: *RPM_RUNNERS_RHEL - <<: *RPM_RUNNERS_RHEL
@ -131,7 +131,7 @@ Container:
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
Packer: Packer:
stage: test stage: test
@ -141,7 +141,7 @@ Packer:
script: script:
- tools/ci-build-worker-packer.sh - tools/ci-build-worker-packer.sh
variables: variables:
RUNNER: aws/rhel-9.3-ga-x86_64 RUNNER: aws/rhel-9.4-ga-x86_64
Prepare-rhel-internal: Prepare-rhel-internal:
stage: prepare-rhel-internal stage: prepare-rhel-internal
@ -179,10 +179,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.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-8.9-ga-aarch64 - aws/rhel-8.10-ga-aarch64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
- aws/rhel-9.3-ga-aarch64 - aws/rhel-9.4-ga-aarch64
- RUNNER: - RUNNER:
- aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64 - aws/rhel-9.5-nightly-aarch64
@ -207,10 +207,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.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-8.9-ga-aarch64 - aws/rhel-8.10-ga-aarch64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
- aws/rhel-9.3-ga-aarch64 - aws/rhel-9.4-ga-aarch64
- aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64 - aws/rhel-9.5-nightly-aarch64
- aws/centos-stream-9-x86_64 - aws/centos-stream-9-x86_64
@ -255,8 +255,8 @@ regression-old-worker-new-composer:
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
extends: .regression extends: .regression
variables: variables:
@ -321,8 +321,8 @@ Trigger-rhel-edge-ci:
.rhel_runners: &rhel_runners .rhel_runners: &rhel_runners
RUNNER: RUNNER:
- aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-x86_64
- aws/rhel-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
- aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64 - aws/rhel-9.5-nightly-aarch64
- aws/centos-stream-9-x86_64 - aws/centos-stream-9-x86_64
@ -362,20 +362,20 @@ koji.sh (cloud upload):
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-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-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-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-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: gcp CLOUD_TARGET: gcp
IMAGE_TYPE: gcp-rhui IMAGE_TYPE: gcp-rhui
@ -391,8 +391,8 @@ koji.sh (cloudapi):
matrix: matrix:
- *fedora_runners - *fedora_runners
- RUNNER: - RUNNER:
- aws/rhel-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
aws.sh: aws.sh:
@ -510,8 +510,8 @@ API:
matrix: matrix:
- <<: *API_TESTS - <<: *API_TESTS
RUNNER: RUNNER:
- aws/rhel-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
- aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
- IMAGE_TYPE: ["iot-commit"] - IMAGE_TYPE: ["iot-commit"]
@ -523,8 +523,8 @@ API:
- aws/fedora-39-aarch64 - aws/fedora-39-aarch64
- IMAGE_TYPE: ["aws"] - IMAGE_TYPE: ["aws"]
RUNNER: RUNNER:
- aws/rhel-8.9-ga-aarch64 - aws/rhel-8.10-ga-aarch64
- aws/rhel-9.3-ga-aarch64 - aws/rhel-9.4-ga-aarch64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
API-module-hotfixes: API-module-hotfixes:
@ -542,14 +542,14 @@ API-module-hotfixes:
- IMAGE_TYPE: - IMAGE_TYPE:
- aws - aws
RUNNER: RUNNER:
- aws/rhel-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-8.9-ga-aarch64 - aws/rhel-8.10-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.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
TEST_MODULE_HOTFIXES: [1] TEST_MODULE_HOTFIXES: [1]
@ -567,8 +567,8 @@ API-module-hotfixes:
- RUNNER: - RUNNER:
- rhos-01/fedora-40-x86_64 - rhos-01/fedora-40-x86_64
- RUNNER: - RUNNER:
- gcp/rhel-8.9-ga-x86_64 - gcp/rhel-8.10-ga-x86_64
- gcp/rhel-9.3-ga-x86_64 - gcp/rhel-9.4-ga-x86_64
- gcp/rhel-9.5-nightly-x86_64 - gcp/rhel-9.5-nightly-x86_64
- gcp/centos-stream-9-x86_64 - gcp/centos-stream-9-x86_64
INTERNAL_NETWORK: ["true"] INTERNAL_NETWORK: ["true"]
@ -590,8 +590,8 @@ ubi-wsl.sh:
parallel: parallel:
matrix: matrix:
- RUNNER: - RUNNER:
- aws/rhel-8.9-ga-x86_64 - aws/rhel-8.10-ga-x86_64
- aws/rhel-9.3-ga-x86_64 - aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
weldr-distro-dot-notation+aliases: weldr-distro-dot-notation+aliases:
@ -646,7 +646,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.9-ga-x86_64 RUNNER: aws/rhel-8.10-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
DISTRO_CODE: rhel-91 DISTRO_CODE: rhel-91
@ -659,8 +659,7 @@ Multi-tenancy:
- schutzbot/deploy.sh - schutzbot/deploy.sh
- /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 RUNNER: aws/rhel-8.10-ga-x86_64
RUNNER: aws/rhel-8.9-ga-x86_64
INTERNAL_NETWORK: "true" INTERNAL_NETWORK: "true"
Upgrade: Upgrade:

82
Schutzfile
View file

@ -171,46 +171,7 @@
"osbuild": { "osbuild": {
"commit": "4dbf8e2d593b769bf4797a18a9c6462696990af3" "commit": "4dbf8e2d593b769bf4797a18a9c6462696990af3"
} }
}, }
"repos": [
{
"file": "/etc/yum.repos.d/rhel8internal.repo",
"x86_64": [
{
"title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.10-20240626"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.10-20240626"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.10-20240626"
}
],
"aarch64": [
{
"title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.10-20240626"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.10-20240626"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.10-20240626"
}
]
}
]
}, },
"rhel-9.2": { "rhel-9.2": {
"dependencies": { "dependencies": {
@ -231,46 +192,7 @@
"osbuild": { "osbuild": {
"commit": "4dbf8e2d593b769bf4797a18a9c6462696990af3" "commit": "4dbf8e2d593b769bf4797a18a9c6462696990af3"
} }
}, }
"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.4-20240626"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20240626"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20240626"
}
],
"aarch64": [
{
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20240626"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20240626"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20240626"
}
]
}
]
}, },
"rhel-9.5": { "rhel-9.5": {
"dependencies": { "dependencies": {