test: switch to rhel-95, drop rhel-810

Makefile

@@ -1,7 +1,7 @@
 # Extract the version from package.json
 VERSION=$(shell $(CURDIR)/rpmversion.sh | cut -d - -f 1)
 RELEASE=$(shell $(CURDIR)/rpmversion.sh | cut -d - -f 2)
-TEST_OS ?= fedora-37
+TEST_OS ?= fedora-40
 export TEST_OS
 VM_IMAGE=$(CURDIR)/test/images/$(TEST_OS)
 

test/files/rhel-94.json → test/files/rhel-95.json

@@ -2,24 +2,24 @@
   "aarch64": [
     {
       "name": "baseos",
-      "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/BaseOS/aarch64/os",
+      "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.5/compose/BaseOS/aarch64/os",
       "gpgcheck": 0
     },
     {
       "name": "appstream",
-      "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/AppStream/aarch64/os",
+      "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.5/compose/AppStream/aarch64/os",
       "gpgcheck": 0
     }
   ],
   "x86_64": [
     {
       "name": "baseos",
-      "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/BaseOS/x86_64/os",
+      "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.5/compose/BaseOS/x86_64/os",
       "gpgcheck": 0
     },
     {
       "name": "appstream",
-      "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.4/compose/AppStream/x86_64/os",
+      "baseurl": "http://download.devel.redhat.com/rhel-9/nightly/RHEL-9/latest-RHEL-9.5/compose/AppStream/x86_64/os",
       "gpgcheck": 0
     }
   ]

test/reference-image

@@ -1 +1 @@
-fedora-34
+fedora-40

test/verify/check-blueprintWizard

@@ -8,6 +8,7 @@ import testlib
 @testlib.no_retry_when_changed
 class TestBlueprintWizard(composerlib.ComposerCase):
 
+    @testlib.timeout("900")
     def testCreateAndDeleteBlueprint(self):
         b = self.browser
 
@@ -24,7 +25,7 @@ class TestBlueprintWizard(composerlib.ComposerCase):
         # select openssh-server
         b.set_input_text("div[data-testid='search-available-pkgs-input'] input", "openssh-server")
         b.click("button[aria-label='Search button for available packages']")
-        with b.wait_timeout(360):
+        with b.wait_timeout(720):
             b.click("li[data-testid='openssh-server']")
             b.click("button[aria-label='Add selected']")
         # go to next page

test/verify/composerlib.py

@@ -46,6 +46,11 @@ def setUp(self):
         done
         """)
 
+        # depsolve one of the blueprints so the repo metadata is cached, this speeds up the tests
+        self.machine.execute("""
+        composer-cli blueprints depsolve httpd-server
+        """, timeout=900)
+
         # delete all blueprints
         self.addCleanup(self.machine.execute,
                         "for bp in $(composer-cli blueprints list); "

test/vm.install

@@ -13,14 +13,12 @@ if [ -n "$VG" ]; then
 fi
 
 # Repositories in /etc/osbuild-composer/repositories are used only for on-premise
-# Copy rpmrepo snapshots for use in tests
 REPODIR=/etc/osbuild-composer/repositories
 sudo mkdir -p $REPODIR
-# Copy all repo overrides
-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
+# Copy rhel nightly overrides
+cp /home/admin/files/rhel-95.json /etc/osbuild-composer/repositories/rhel-95.json
+ln -s /etc/osbuild-composer/repositories/rhel-95.json /etc/osbuild-composer/repositories/rhel-95-beta.json
+ln -s /etc/osbuild-composer/repositories/rhel-95.json /etc/osbuild-composer/repositories/rhel-95-ga.json
 
 # Allow cockpit port (9090) in INPUT chain
 # Do not reload firewall rule during image generation