From 06778635432d8a69336a412b2749b79dc92da4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Mu=C3=B1oz?= Date: Tue, 7 Nov 2023 14:42:31 +0900 Subject: [PATCH] Added RHEL-8.10 and RHEL-9.4 runners for early testing. --- .gitlab-ci.yml | 16 ++--- Schutzfile | 156 +++++++++++++++++++++++++++++++++++--------- schutzbot/terraform | 2 +- 3 files changed, 133 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 426e223e..dd4932e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,29 +107,29 @@ Prepare-rhel-internal: - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.7-ga-x86_64 - aws/rhel-9.1-ga-x86_64 - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-9.3-nightly-x86_64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-9.4-nightly-x86_64 - aws/centos-stream-9-x86_64 INTERNAL_NETWORK: ["true"] .rhel_runners_aarch64: &rhel_runners_aarch64 RUNNER: - - aws/rhel-8.9-nightly-aarch64 - - aws/rhel-9.3-nightly-aarch64 + - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-9.4-nightly-aarch64 INTERNAL_NETWORK: ["true"] .rhel_runners_x86_64_internal_nightlies: &rhel_runners_x86_64_internal_nightlies RUNNER: - - aws/rhel-8.9-nightly-x86_64 - - aws/rhel-9.3-nightly-x86_64 + - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-9.4-nightly-x86_64 INTERNAL_NIGHTLY: ["internal"] INTERNAL_NETWORK: ["true"] NIGHTLY: ["true"] .rhel_runners_aarch64_internal_nightlies: &rhel_runners_aarch64_internal_nightlies RUNNER: - - aws/rhel-8.9-nightly-aarch64 - - aws/rhel-9.3-nightly-aarch64 + - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-9.4-nightly-aarch64 INTERNAL_NIGHTLY: ["internal"] INTERNAL_NETWORK: ["true"] NIGHTLY: ["true"] diff --git a/Schutzfile b/Schutzfile index 95379113..389047a4 100644 --- a/Schutzfile +++ b/Schutzfile @@ -46,14 +46,14 @@ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-20231012" } ], "aarch64": [ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-20231012" } ] }, @@ -63,14 +63,14 @@ { "title": "updates-modular", "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-modular-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-x86_64-updates-released-modular-20231012" } ], "aarch64": [ { "title": "updates-modular", "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-modular-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f37/f37-aarch64-updates-released-modular-20231012" } ] } @@ -123,14 +123,14 @@ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-updates-released-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-updates-released-20231012" } ], "aarch64": [ { "title": "updates", "name": "updates", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-updates-released-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-updates-released-20231012" } ] }, @@ -140,14 +140,14 @@ { "title": "updates-modular", "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-updates-released-modular-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-x86_64-updates-released-modular-20231012" } ], "aarch64": [ { "title": "updates-modular", "name": "updates-modular", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-updates-released-modular-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f38/f38-aarch64-updates-released-modular-20231012" } ] } @@ -194,34 +194,80 @@ { "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20231012" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20231012" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.9-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.9-20231012" } ], "aarch64": [ { "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.9-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.9-20231012" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.9-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.9-20231012" }, { "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.9-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.9-20231012" + } + ] + } + ] + }, + "rhel-8.10": { + "dependencies": { + "osbuild": { + "commit": "fd29a31832f6d97b1c3dc23666117f617963b595" + } + }, + "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-20231015" + }, + { + "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", + "name": "appstream", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.10-20231015" + }, + { + "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", + "name": "crb", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.10-20231015" + } + ], + "aarch64": [ + { + "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", + "name": "baseos", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.10-20231015" + }, + { + "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", + "name": "appstream", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.10-20231015" + }, + { + "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", + "name": "crb", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.10-20231015" } ] } @@ -261,34 +307,80 @@ { "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.3-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.3-20231012" + }, + { + "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", + "name": "appstream", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.3-20231012" + }, + { + "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", + "name": "crb", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.3-20231012" + } + ], + "aarch64": [ + { + "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", + "name": "baseos", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.3-20231012" + }, + { + "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", + "name": "appstream", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.3-20231012" + }, + { + "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", + "name": "crb", + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.3-20231012" + } + ] + } + ] + }, + "rhel-9.4": { + "dependencies": { + "osbuild": { + "commit": "fd29a31832f6d97b1c3dc23666117f617963b595" + } + }, + "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-20231015" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.3-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20231015" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.3-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20231015" } ], "aarch64": [ { "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.3-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20231015" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.3-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20231015" }, { "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.3-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20231015" } ] } @@ -321,34 +413,34 @@ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-baseos-20231012" }, { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-appstream-20231012" }, { "title": "crb", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-x86_64-crb-20231012" } ], "aarch64": [ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-baseos-20231012" }, { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-appstream-20231012" }, { "title": "crb", "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el9/cs9-aarch64-crb-20231012" } ] } @@ -367,14 +459,14 @@ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-baseos-20231012" } ], "aarch64": [ { "title": "baseos", "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-baseos-20231012" } ] }, @@ -384,14 +476,14 @@ { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-appstream-20231012" } ], "aarch64": [ { "title": "appstream", "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-appstream-20231012" } ] }, @@ -401,14 +493,14 @@ { "title": "powertools", "name": "powertools", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-x86_64-powertools-20231012" } ], "aarch64": [ { "title": "powertools", "name": "powertoosl", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20230824" + "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el8/cs8-aarch64-powertools-20231012" } ] } diff --git a/schutzbot/terraform b/schutzbot/terraform index 4167dd26..b44f0f2f 100644 --- a/schutzbot/terraform +++ b/schutzbot/terraform @@ -1 +1 @@ -8f1b3d192a932aa9eb049d9c32a3c9ef724d96a1 \ No newline at end of file +a811c09b5ce5831768b09841dd5696fc967ab41a \ No newline at end of file