Merge pull request #652 from kravciak/main

Fixup: Install 1.11.0-rc for PR tests
rancher · Mar 18, 2024 · d30cdc4 · d30cdc4
2 parents 1a71314 + fb78022
commit d30cdc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/e2e/00-installation.spec.ts b/tests/e2e/00-installation.spec.ts
@@ -181,7 +181,7 @@ test('05 Whitelist Artifact Hub', async({ page, ui, nav }) => {
   })
 })
 
-test('06 Upgrade Kubewarden', async({ page, nav, shell }) => {
+test('06 Upgrade Kubewarden', async({ page, nav }) => {
   test.skip(!UPGRADE)
 
   const kwPage = new KubewardenPage(page)
@@ -226,7 +226,7 @@ test('06a Upgrade KW 1.10.0 to 1.11.0-rc', async({ page }) => {
 
   const current = (await kwPage.getCurrentVersion()).app
   if (current === 'v1.10.0') {
-    await apps.updateApp('rancher-kubewarden-controller', { version: 0, yamlPatch: (y) => { y.auditScanner.image.tag = 'latest' } })
+    await apps.updateApp('rancher-kubewarden-controller', { version: 0 })
     await apps.updateApp('rancher-kubewarden-defaults', { version: 0 })
   }
 })

diff --git a/tests/e2e/30-policyservers.spec.ts b/tests/e2e/30-policyservers.spec.ts
@@ -50,8 +50,8 @@ test('Policy Servers', async({ page, ui, nav }) => {
     // Default PS could be updated to latest rc
     if (UPGRADE && dVer.prerelease.length > 0) {
       expect(semver.lt(cVer, dVer)).toBeTruthy()
-    } else {
-      expect(semver.eq(cVer, dVer)).toBeTruthy()
+    // } else {
+      // expect(semver.eq(cVer, dVer)).toBeTruthy()
     }
   })