Skip to content

Commit

Permalink
.gitlab-ci.yml: switch to rhel 8.10 and 9.4 GA
Browse files Browse the repository at this point in the history
  • Loading branch information
@croissanne
croissanne committed Jun 12, 2024
1 parent 7e89085 commit 2f6d34f
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 122 deletions.
81 changes: 40 additions & 41 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ RPM:
- aws/fedora-39-aarch64
- aws/rhel-8.4-ga-x86_64
- aws/rhel-8.4-ga-aarch64
- aws/rhel-8.9-ga-x86_64
- aws/rhel-8.9-ga-aarch64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-9.3-ga-aarch64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-8.10-ga-aarch64
- aws/rhel-9.4-ga-x86_64
- aws/rhel-9.4-ga-aarch64
- aws/centos-stream-9-x86_64
- aws/centos-stream-9-aarch64
- <<: *RPM_RUNNERS_RHEL
Expand Down Expand Up @@ -135,7 +135,7 @@ Container:
parallel:
matrix:
- RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-8.10-ga-x86_64

Packer:
stage: test
Expand All @@ -145,7 +145,7 @@ Packer:
script:
- tools/ci-build-worker-packer.sh
variables:
RUNNER: aws/rhel-9.3-ga-x86_64
RUNNER: aws/rhel-9.4-ga-x86_64

Prepare-rhel-internal:
stage: prepare-rhel-internal
Expand Down Expand Up @@ -186,10 +186,10 @@ Base:
- aws/fedora-39-aarch64
- aws/rhel-8.4-ga-x86_64
- aws/rhel-8.4-ga-aarch64
- aws/rhel-8.9-ga-x86_64
- aws/rhel-8.9-ga-aarch64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-9.3-ga-aarch64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-8.10-ga-aarch64
- aws/rhel-9.4-ga-x86_64
- aws/rhel-9.4-ga-aarch64
- RUNNER:
- aws/rhel-8.10-nightly-x86_64
- aws/rhel-8.10-nightly-aarch64
Expand Down Expand Up @@ -218,10 +218,10 @@ Base:
- RUNNER:
- aws/rhel-8.4-ga-x86_64
- aws/rhel-8.4-ga-aarch64
- aws/rhel-8.9-ga-x86_64
- aws/rhel-8.9-ga-aarch64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-9.3-ga-aarch64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-8.10-ga-aarch64
- aws/rhel-9.4-ga-x86_64
- aws/rhel-9.4-ga-aarch64
- aws/rhel-8.10-nightly-x86_64
- aws/rhel-8.10-nightly-aarch64
- aws/rhel-9.5-nightly-x86_64
Expand Down Expand Up @@ -268,8 +268,8 @@ regression-old-worker-new-composer:
parallel:
matrix:
- RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: ["true"]
extends: .regression
variables:
Expand Down Expand Up @@ -336,8 +336,8 @@ Trigger-rhel-edge-ci:
.rhel_runners: &rhel_runners
RUNNER:
- aws/rhel-8.4-ga-x86_64
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.4-ga-x86_64
- aws/rhel-8.10-nightly-x86_64
- aws/rhel-8.10-nightly-aarch64
- aws/rhel-9.5-nightly-x86_64
Expand Down Expand Up @@ -380,20 +380,20 @@ koji.sh (cloud upload):
parallel:
matrix:
- RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: aws
IMAGE_TYPE: aws-rhui
- RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: azure
IMAGE_TYPE: azure-rhui
- RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: ["true"]
CLOUD_TARGET: gcp
IMAGE_TYPE: gcp-rhui
Expand All @@ -409,8 +409,8 @@ koji.sh (cloudapi):
matrix:
- *fedora_runners
- RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: ["true"]

aws.sh:
Expand Down Expand Up @@ -531,8 +531,8 @@ API:
matrix:
- <<: *API_TESTS
RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.4-ga-x86_64
- aws/rhel-8.10-nightly-x86_64
- aws/rhel-9.5-nightly-x86_64
INTERNAL_NETWORK: ["true"]
Expand All @@ -546,8 +546,8 @@ API:
- aws/fedora-39-aarch64
- IMAGE_TYPE: ["aws"]
RUNNER:
- aws/rhel-8.9-ga-aarch64
- aws/rhel-9.3-ga-aarch64
- aws/rhel-8.10-ga-aarch64
- aws/rhel-9.4-ga-aarch64
INTERNAL_NETWORK: ["true"]

API-module-hotfixes:
Expand All @@ -565,14 +565,14 @@ API-module-hotfixes:
- IMAGE_TYPE:
- aws
RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-8.9-ga-aarch64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-8.10-ga-aarch64
INTERNAL_NETWORK: ["true"]
TEST_MODULE_HOTFIXES: [1]
- IMAGE_TYPE:
- vsphere
RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-8.10-ga-x86_64
INTERNAL_NETWORK: ["true"]
TEST_MODULE_HOTFIXES: [1]

Expand All @@ -591,8 +591,8 @@ API-module-hotfixes:
- rhos-01/fedora-38-x86_64
# - rhos-01/fedora-39-x86_64
- RUNNER:
- gcp/rhel-8.9-ga-x86_64
- gcp/rhel-9.3-ga-x86_64
- gcp/rhel-8.10-ga-x86_64
- gcp/rhel-9.4-ga-x86_64
- gcp/rhel-8.10-nightly-x86_64
- gcp/rhel-9.5-nightly-x86_64
- gcp/centos-stream-9-x86_64
Expand All @@ -615,8 +615,8 @@ ubi-wsl.sh:
parallel:
matrix:
- RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.4-ga-x86_64
INTERNAL_NETWORK: "true"

weldr-distro-dot-notation+aliases:
Expand All @@ -631,7 +631,7 @@ weldr-distro-dot-notation+aliases:
parallel:
matrix:
- RUNNER:
- aws/rhel-8.8-ga-x86_64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-9.5-nightly-x86_64
INTERNAL_NETWORK: ["true"]

Expand Down Expand Up @@ -671,7 +671,7 @@ RHEL 9 on 8:
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/koji.sh
variables:
RUNNER: aws/rhel-8.9-ga-x86_64
RUNNER: aws/rhel-8.10-ga-x86_64
INTERNAL_NETWORK: "true"
DISTRO_CODE: rhel-91

Expand All @@ -684,8 +684,7 @@ Multi-tenancy:
- schutzbot/deploy.sh
- /usr/libexec/tests/osbuild-composer/multi-tenancy.sh
variables:
# only 8.7 GA b/c the Image Builder service runs on RHEL 8
RUNNER: aws/rhel-8.9-ga-x86_64
RUNNER: aws/rhel-8.10-ga-x86_64
INTERNAL_NETWORK: "true"

Upgrade:
Expand Down
84 changes: 3 additions & 81 deletions Schutzfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,46 +171,7 @@
"osbuild": {
"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-20240514"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.10-20240514"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.10-20240514"
}
],
"aarch64": [
{
"title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.10-20240514"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.10-20240514"
},
{
"title": "RHEL-8-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.10-20240514"
}
]
}
]
}
},
"rhel-9.2": {
"dependencies": {
Expand All @@ -231,46 +192,7 @@
"osbuild": {
"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-20240514"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20240514"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20240514"
}
],
"aarch64": [
{
"title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20240514"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20240514"
},
{
"title": "RHEL-9-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20240514"
}
]
}
]
}
},
"rhel-9.5": {
"dependencies": {
Expand Down Expand Up @@ -371,4 +293,4 @@
}
]
}
}
}

0 comments on commit 2f6d34f

Please sign in to comment.