From 40f4073a7ea4c033edd240f225a550d43c6b006c Mon Sep 17 00:00:00 2001 From: jkozol Date: Wed, 21 Feb 2024 02:21:59 +0100 Subject: [PATCH] test: update rhel repo overrides The centos stream repo declarations still work as expected but the rhel repo overrides need to be declared and updated. --- test/files/{rhel-89.json => rhel-810.json} | 8 ++++---- test/files/{rhel-93.json => rhel-94.json} | 8 ++++---- test/vm.install | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) rename test/files/{rhel-89.json => rhel-810.json} (70%) rename test/files/{rhel-93.json => rhel-94.json} (71%) diff --git a/test/files/rhel-89.json b/test/files/rhel-810.json similarity index 70% rename from test/files/rhel-89.json rename to test/files/rhel-810.json index edf783e81..444a7fa8a 100644 --- a/test/files/rhel-89.json +++ b/test/files/rhel-810.json @@ -2,24 +2,24 @@ "aarch64": [ { "name": "baseos", - "baseurl": "http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9/compose/BaseOS/aarch64/os", + "baseurl": "http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10/compose/BaseOS/aarch64/os", "gpgcheck": 0 }, { "name": "appstream", - "baseurl": "http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9/compose/AppStream/aarch64/os", + "baseurl": "http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10/compose/AppStream/aarch64/os", "gpgcheck": 0 } ], "x86_64": [ { "name": "baseos", - "baseurl": "http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9/compose/BaseOS/x86_64/os", + "baseurl": "http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10/compose/BaseOS/x86_64/os", "gpgcheck": 0 }, { "name": "appstream", - "baseurl": "http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.9/compose/AppStream/x86_64/os", + "baseurl": "http://download.devel.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.10/compose/AppStream/x86_64/os", "gpgcheck": 0 } ] diff --git a/test/files/rhel-93.json b/test/files/rhel-94.json similarity index 71% rename from test/files/rhel-93.json rename to test/files/rhel-94.json index ad17ad0c9..dad9617b1 100644 --- a/test/files/rhel-93.json +++ b/test/files/rhel-94.json @@ -2,24 +2,24 @@ "aarch64": [ { "name": "baseos", - "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/BaseOS/aarch64/os", + "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/BaseOS/aarch64/os", "gpgcheck": 0 }, { "name": "appstream", - "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/AppStream/aarch64/os", + "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/AppStream/aarch64/os", "gpgcheck": 0 } ], "x86_64": [ { "name": "baseos", - "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/BaseOS/x86_64/os", + "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/BaseOS/x86_64/os", "gpgcheck": 0 }, { "name": "appstream", - "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.3/compose/AppStream/x86_64/os", + "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/AppStream/x86_64/os", "gpgcheck": 0 } ] diff --git a/test/vm.install b/test/vm.install index 50dceb420..0f95b64fd 100755 --- a/test/vm.install +++ b/test/vm.install @@ -17,10 +17,10 @@ fi REPODIR=/etc/osbuild-composer/repositories sudo mkdir -p $REPODIR # Copy all repo overrides -cp /home/admin/files/rhel-89.json /etc/osbuild-composer/repositories/rhel-89.json -cp /home/admin/files/rhel-93.json /etc/osbuild-composer/repositories/rhel-93.json -ln -s /etc/osbuild-composer/repositories/rhel-93.json /etc/osbuild-composer/repositories/rhel-93-beta.json -ln -s /etc/osbuild-composer/repositories/rhel-93.json /etc/osbuild-composer/repositories/rhel-93-ga.json +cp /home/admin/files/rhel-810.json /etc/osbuild-composer/repositories/rhel-810.json +cp /home/admin/files/rhel-94.json /etc/osbuild-composer/repositories/rhel-94.json +ln -s /etc/osbuild-composer/repositories/rhel-94.json /etc/osbuild-composer/repositories/rhel-94-beta.json +ln -s /etc/osbuild-composer/repositories/rhel-94.json /etc/osbuild-composer/repositories/rhel-94-ga.json # Allow cockpit port (9090) in INPUT chain # Do not reload firewall rule during image generation