diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4dd1bd3f..1f39cedb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,23 +108,23 @@ 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" ] @@ -132,6 +132,7 @@ prepare-rhel-internal-runners: .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" ] @@ -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 diff --git a/Schutzfile b/Schutzfile index 9086edbf..0337285d 100644 --- a/Schutzfile +++ b/Schutzfile @@ -2,7 +2,7 @@ "fedora-38": { "dependencies": { "osbuild": { - "commit": "2e5a9335c94228726b36f804468651e605d70a88" + "commit": "df83c629201f3955dfb07016c31409d85f376a29" } }, "repos": [ @@ -79,7 +79,7 @@ "fedora-39": { "dependencies": { "osbuild": { - "commit": "2e5a9335c94228726b36f804468651e605d70a88" + "commit": "df83c629201f3955dfb07016c31409d85f376a29" } }, "repos": [ @@ -122,7 +122,7 @@ "fedora-40": { "dependencies": { "osbuild": { - "commit": "2e5a9335c94228726b36f804468651e605d70a88" + "commit": "df83c629201f3955dfb07016c31409d85f376a29" } }, "repos": [ @@ -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": [ @@ -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": [ @@ -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" + } + ] + } + ] } } \ No newline at end of file diff --git a/schutzbot/terraform b/schutzbot/terraform index ab6a0f4c..404c5977 100644 --- a/schutzbot/terraform +++ b/schutzbot/terraform @@ -1 +1 @@ -445f5effb0cd29f2b0610bcec88acc22475f6326 \ No newline at end of file +b39783c2e634fa0aa0c77d31f9374bc71554db4e \ No newline at end of file