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

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

Merged
merged 4 commits into from
Jul 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d1e9c3
.gitlab-ci.yml: switch to rhel 8.10 and 9.4 GA
croissanne May 29, 2024
f29617f
test/data/repositories: switch to cdn for rhel 8.10 and 9.4
croissanne Jul 3, 2024
5df6f7c
.gitlab-ci.yml: remove rhel-8.4
croissanne Jul 3, 2024
04ada30
tools/koji-compose: deal with rhsm repositories
croissanne Jul 3, 2024
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
91 changes: 41 additions & 50 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,10 @@ RPM:
- aws/fedora-39-aarch64
- aws/fedora-40-x86_64
- aws/fedora-40-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 @@ -131,7 +129,7 @@ Container:
parallel:
matrix:
- RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-8.10-ga-x86_64

Packer:
stage: test
Expand All @@ -141,7 +139,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 @@ -177,12 +175,10 @@ Base:
- RUNNER:
- aws/fedora-39-x86_64
- 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-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64
Expand All @@ -205,12 +201,10 @@ Base:
- aws/fedora-39-x86_64
- aws/fedora-39-aarch64
- 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-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64
- aws/centos-stream-9-x86_64
Expand Down Expand Up @@ -255,8 +249,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 @@ -292,8 +286,8 @@ Image Tests:
parallel:
matrix:
- RUNNER:
- aws/rhel-8.4-ga-x86_64
- aws/rhel-8.4-ga-aarch64
- aws/rhel-8.10-ga-x86_64
- aws/rhel-8.10-ga-aarch64
- aws/rhel-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64
INTERNAL_NETWORK: ["true"]
Expand All @@ -320,9 +314,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-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64
- aws/centos-stream-9-x86_64
Expand Down Expand Up @@ -362,20 +355,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 @@ -391,14 +384,13 @@ 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:
extends: .integration
rules:
# Skip rhel-8.4-ga-x86_64
- if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-8.4-[\S]+/'
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
variables:
Expand Down Expand Up @@ -509,8 +501,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-9.5-nightly-x86_64
INTERNAL_NETWORK: ["true"]
- IMAGE_TYPE: ["iot-commit"]
Expand All @@ -522,8 +514,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 @@ -541,14 +533,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 @@ -566,8 +558,8 @@ API-module-hotfixes:
- RUNNER:
- rhos-01/fedora-40-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-9.5-nightly-x86_64
- gcp/centos-stream-9-x86_64
INTERNAL_NETWORK: ["true"]
Expand All @@ -589,8 +581,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 Down Expand Up @@ -645,7 +637,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 @@ -658,8 +650,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
82 changes: 2 additions & 80 deletions Schutzfile
View file
Open in desktop
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-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": {
"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-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": {
"dependencies": {
Expand Down