From 682ba2e41616ab16384060e9824888c49c5380a7 Mon Sep 17 00:00:00 2001
From: Julien Adamek <julien.adamek@suse.com>
Date: Wed, 26 Apr 2023 16:16:27 +0200
Subject: [PATCH] ci/ui: iso is no longer named elemental.iso

---
 tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts | 4 ++--
 tests/cypress/latest/support/functions.ts           | 2 +-
 tests/scripts/start-cypress-tests                   | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
index c6a9a3c6a..251b9072c 100644
--- a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
+++ b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
@@ -148,9 +148,9 @@ describe('Upgrade tests', () => {
       cy.get('.primaryheader')
         .contains('Active');
       cy.get('.primaryheader')
-        .contains('Updating', {timeout: 360000});
+        .contains('Active', {timeout: 420000}).should('not.exist');
       cy.get('.primaryheader')
-        .contains('Active', {timeout: 360000});
+        .contains('Active', {timeout: 420000});
     });
 
     it('Cannot create two upgrade groups targeting the same cluster', () => {
diff --git a/tests/cypress/latest/support/functions.ts b/tests/cypress/latest/support/functions.ts
index b7b6e51f5..1f946f802 100644
--- a/tests/cypress/latest/support/functions.ts
+++ b/tests/cypress/latest/support/functions.ts
@@ -275,7 +275,7 @@ Cypress.Commands.add('createMachReg', ({
       })
       cy.getBySel('download-iso-btn')
         .click()
-      cy.verifyDownload('elemental.iso', { timeout: 180000, interval: 5000 });
+      cy.verifyDownload('.iso', { contains:true, timeout: 180000, interval: 5000 });
     }
   
       // Check Cloud configuration
diff --git a/tests/scripts/start-cypress-tests b/tests/scripts/start-cypress-tests
index 5ab92c198..8bc4747a7 100755
--- a/tests/scripts/start-cypress-tests
+++ b/tests/scripts/start-cypress-tests
@@ -31,12 +31,14 @@ docker run -v $PWD:/workdir -w /workdir                     \
     $CYPRESS_DOCKER                                         \
     -s $SPEC
 
-popd
+[[ -d downloads ]] && sudo chown -R gh-runner:users downloads videos
 
 # Move elemental.iso into the expected folder
 if [[ ${ISO_BOOT} == "true" ]]; then
-    sudo mv cypress/latest/downloads/elemental.iso ../elemental-from-cypress.iso
+    mv downloads/*.iso ../../../elemental-from-cypress.iso
 fi
 
+popd
+
 # Kill the HTTP server
 pkill -f "${HTTP_SRV_CMD}"