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

Updated runners based on osbuild-composer and gitlab-ci-terraform. #332

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Updated runners based on osbuild-composer and gitlab-ci-terraform. #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ae0b74
Updated runners based on osbuild-composer and gitlab-ci-terraform.
narmaku Aug 5, 2024
6d43c82
Commenting out the RHEL-10.0 runners for now.
narmaku Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,30 +108,31 @@ prepare-rhel-internal-runners:

.rhel_runners: &rhel_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
- aws/centos-stream-9-x86_64
# - aws/rhel-8.4-ga-x86_64 / This was unstable and disabled by Image Builder. So we did the same
NIGHTLY: [ "false" ]

# Commenting this section until we have GA runners for RHEL-8.10 and RHEL-9.5
# .rhel_runners_aarch64: &rhel_runners_aarch64
# RUNNER:
# - aws/rhel-8.10-ga-aarch64
# - aws/rhel-9.5-ga-aarch64
# INTERNAL_NETWORK: [ "true" ]
# NIGHTLY: [ "false" ]
.rhel_runners_aarch64: &rhel_runners_aarch64
RUNNER:
- aws/rhel-8.10-ga-aarch64
- aws/rhel-9.4-ga-aarch64
- aws/centos-stream-9-aarch64
INTERNAL_NETWORK: [ "true" ]
NIGHTLY: [ "false" ]

.rhel_runners_x86_64_internal_nightlies: &rhel_runners_x86_64_internal_nightlies
RUNNER:
- aws/rhel-9.5-nightly-x86_64
# - aws/rhel-10.0-nightly-x86_64
INTERNAL_NIGHTLY: [ "internal" ]
INTERNAL_NETWORK: [ "true" ]
NIGHTLY: [ "true" ]

.rhel_runners_aarch64_internal_nightlies: &rhel_runners_aarch64_internal_nightlies
RUNNER:
- aws/rhel-9.5-nightly-aarch64
# - aws/rhel-10.0-nightly-aarch64
INTERNAL_NIGHTLY: [ "internal" ]
INTERNAL_NETWORK: [ "true" ]
NIGHTLY: [ "true" ]
Expand Down Expand Up @@ -165,7 +166,7 @@ image-builder-aws:
matrix:
- *fedora_runners
- *rhel_runners
# - *rhel_runners_aarch64
- *rhel_runners_aarch64

image-builder-aws-nightly-compose:
stage: test
Expand Down
120 changes: 106 additions & 14 deletions Schutzfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"fedora-38": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
},
"repos": [
Expand Down Expand Up @@ -79,7 +79,7 @@
"fedora-39": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
},
"repos": [
Expand Down Expand Up @@ -122,7 +122,7 @@
"fedora-40": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
},
"repos": [
Expand All @@ -148,56 +148,56 @@
"rhel-8.4": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
}
},
"rhel-8.8": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
}
},
"rhel-8.9": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
}
},
"rhel-8.10": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
}
},
"rhel-9.2": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
}
},
"rhel-9.3": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
}
},
"rhel-9.4": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
}
},
"rhel-9.5": {
"dependencies": {
"osbuild": {
"commit": "4f4bddcc758303022ba4a0aa46d9c77d5593a625"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
},
"repos": [
Expand Down Expand Up @@ -240,17 +240,63 @@
}
]
},
"rhel-10.0": {
"dependencies": {
"osbuild": {
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
},
"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-20240715"
},
{
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.0-20240715"
},
{
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.0-20240715"
}
],
"aarch64": [
{
"title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.0-20240715"
},
{
"title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.0-20240715"
},
{
"title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.0-20240715"
}
]
}
]
},
"centos-9": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
}
},
"centos-stream-9": {
"centos-stream-9": {
"dependencies": {
"osbuild": {
"commit": "2e5a9335c94228726b36f804468651e605d70a88"
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
},
"repos": [
Expand Down Expand Up @@ -292,5 +338,51 @@
]
}
]
},
"centos-stream-10": {
"dependencies": {
"osbuild": {
"commit": "df83c629201f3955dfb07016c31409d85f376a29"
}
},
"repos": [
{
"file": "/etc/yum.repos.d/centos.repo",
"x86_64": [
{
"title": "baseos",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-baseos-20240715"
},
{
"title": "appstream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-appstream-20240715"
},
{
"title": "crb",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-crb-20240715"
}
],
"aarch64": [
{
"title": "baseos",
"name": "baseos",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-baseos-20240715"
},
{
"title": "appstream",
"name": "appstream",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-appstream-20240715"
},
{
"title": "crb",
"name": "crb",
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-crb-20240715"
}
]
}
]
}
}
2 changes: 1 addition & 1 deletion schutzbot/terraform
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
445f5effb0cd29f2b0610bcec88acc22475f6326
b39783c2e634fa0aa0c77d31f9374bc71554db4e
Loading