diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4132836f..183d102c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,15 +45,13 @@ RPM: - aws/centos-stream-10-aarch64 - aws/rhel-8.10-ga-x86_64 - aws/rhel-8.10-ga-aarch64 - - aws/rhel-9.5-ga-x86_64 - - aws/rhel-9.5-ga-aarch64 + - aws/rhel-9.6-ga-x86_64 + - aws/rhel-9.6-ga-aarch64 + - aws/rhel-10.0-ga-x86_64 + - aws/rhel-10.0-ga-aarch64 - RUNNER: - - aws/rhel-9.6-nightly-x86_64 - - aws/rhel-9.6-nightly-aarch64 - aws/rhel-9.7-nightly-x86_64 - aws/rhel-9.7-nightly-aarch64 - - aws/rhel-10.0-nightly-x86_64 - - aws/rhel-10.0-nightly-aarch64 - aws/rhel-10.1-nightly-x86_64 - aws/rhel-10.1-nightly-aarch64 INTERNAL_NETWORK: "true" @@ -142,14 +140,12 @@ Manifests: CHUNK: [1, 2, 3, 4, 5] CHUNKS_COUNT: 5 - RUNNER: - - aws/rhel-9.5-ga-x86_64 - - aws/rhel-9.5-ga-aarch64 - - aws/rhel-9.6-nightly-x86_64 - - aws/rhel-9.6-nightly-aarch64 + - aws/rhel-9.6-ga-x86_64 + - aws/rhel-9.6-ga-aarch64 - aws/rhel-9.7-nightly-x86_64 - aws/rhel-9.7-nightly-aarch64 - - aws/rhel-10.0-nightly-x86_64 - - aws/rhel-10.0-nightly-aarch64 + - aws/rhel-10.0-ga-x86_64 + - aws/rhel-10.0-ga-aarch64 - aws/rhel-10.1-nightly-x86_64 - aws/rhel-10.1-nightly-aarch64 INTERNAL_NETWORK: "true" diff --git a/Schutzfile b/Schutzfile index 370aa033..72999b32 100644 --- a/Schutzfile +++ b/Schutzfile @@ -150,47 +150,6 @@ } ] }, - "rhel-9.6": { - "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.6-20250626" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.6-20250626" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.6-20250626" - } - ], - "aarch64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.6-20250626" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.6-20250626" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.6-20250626" - } - ] - } - ] - }, "rhel-9.7": { "repos": [ { @@ -232,47 +191,6 @@ } ] }, - "rhel-10.0": { - "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-20250626" - }, - { - "title": "RHEL-10-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.0-20250626" - }, - { - "title": "RHEL-10-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.0-20250626" - } - ], - "aarch64": [ - { - "title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.0-20250626" - }, - { - "title": "RHEL-10-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.0-20250626" - }, - { - "title": "RHEL-10-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.0-20250626" - } - ] - } - ] - }, "rhel-10.1": { "repos": [ { @@ -314,4 +232,4 @@ } ] } -} \ No newline at end of file +} diff --git a/schutzbot/terraform b/schutzbot/terraform index 9a64fd4c..a3ddc921 100644 --- a/schutzbot/terraform +++ b/schutzbot/terraform @@ -1 +1 @@ -7b4735d287dd0950e0a6f47dde65b62b0f239da1 +cf0a810fd3b75fa27139746c4dfe72222e13dcba