From c822cb22f222c07bd8212c8dee6f87008742cdea Mon Sep 17 00:00:00 2001 From: Fran de Paz Date: Tue, 7 Nov 2023 18:44:36 +0100 Subject: [PATCH 1/3] [bitnami/kubeapps] Update Cypress tests Signed-off-by: Fran de Paz --- .vib/kubeapps/cypress/cypress.json | 3 +-- .vib/kubeapps/cypress/cypress/integration/kubeapps_spec.js | 3 +-- .vib/kubeapps/vib-verify.json | 3 +-- bitnami/kubeapps/Chart.yaml | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.vib/kubeapps/cypress/cypress.json b/.vib/kubeapps/cypress/cypress.json index 30f5b69703f854..0daa95e0a493f5 100644 --- a/.vib/kubeapps/cypress/cypress.json +++ b/.vib/kubeapps/cypress/cypress.json @@ -1,8 +1,7 @@ { "baseUrl": "http://localhost/", "env": { - "repoName": "bitnami", - "repoURL": "oci://registry-1.docker.io/bitnamicharts" + "registryName": "bitnamicharts" }, "defaultCommandTimeout": 30000 } diff --git a/.vib/kubeapps/cypress/cypress/integration/kubeapps_spec.js b/.vib/kubeapps/cypress/cypress/integration/kubeapps_spec.js index a62e766fd3e250..76fd1f937e1b25 100644 --- a/.vib/kubeapps/cypress/cypress/integration/kubeapps_spec.js +++ b/.vib/kubeapps/cypress/cypress/integration/kubeapps_spec.js @@ -18,8 +18,7 @@ it('allows managing a helm chart release', () => { cy.get('#search').type(releases.newRelease.application); cy.contains('div.card', releases.newRelease.application).click(); - cy.contains(Cypress.env('repoName')); - cy.contains(Cypress.env('repoURL')); + cy.contains(Cypress.env('registryName')); cy.contains('Deploy').click(); cy.get('#releaseName').type(releaseName); diff --git a/.vib/kubeapps/vib-verify.json b/.vib/kubeapps/vib-verify.json index 4936feda77b1e4..e148a7ec8411d1 100644 --- a/.vib/kubeapps/vib-verify.json +++ b/.vib/kubeapps/vib-verify.json @@ -53,8 +53,7 @@ }, "endpoint": "lb-kubeapps-http", "env": { - "repoName": "bitnami", - "repoURL": "oci://registry-1.docker.io/bitnamicharts" + "registryName": "bitnamicharts" }, "app_protocol": "HTTP" } diff --git a/bitnami/kubeapps/Chart.yaml b/bitnami/kubeapps/Chart.yaml index 67813417609717..ea8b792ef277a3 100644 --- a/bitnami/kubeapps/Chart.yaml +++ b/bitnami/kubeapps/Chart.yaml @@ -52,4 +52,4 @@ maintainers: name: kubeapps sources: - https://github.com/bitnami/charts/tree/main/bitnami/kubeapps -version: 14.0.2 +version: 14.0.3 From 4f0e571e311574c5a158b030945d0a51e0e2d555 Mon Sep 17 00:00:00 2001 From: Fran de Paz Date: Tue, 7 Nov 2023 19:38:19 +0100 Subject: [PATCH 2/3] Manage app exception Signed-off-by: Fran de Paz --- .vib/kubeapps/cypress/cypress/support/commands.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.vib/kubeapps/cypress/cypress/support/commands.js b/.vib/kubeapps/cypress/cypress/support/commands.js index 1e2b152b41e2dd..15868d903a7bb2 100644 --- a/.vib/kubeapps/cypress/cypress/support/commands.js +++ b/.vib/kubeapps/cypress/cypress/support/commands.js @@ -24,3 +24,13 @@ Cypress.Commands.add('login', () => { cy.contains('Submit').click(); }) }); + +Cypress.on('uncaught:exception', (err) => { + // we expect a 3rd party library error with message 'ResizeObserver loop' + // and don't want to fail the test so we return false + if (err.message.includes("ResizeObserver loop")) { + return false; + } + // we still want to ensure there are no other unexpected + // errors, so we let them fail the test +}) From c6a115693438c1b2a329b0f7fa84c2c917610c69 Mon Sep 17 00:00:00 2001 From: Fran de Paz Date: Wed, 8 Nov 2023 09:05:33 +0100 Subject: [PATCH 3/3] Revert VIB trigger Signed-off-by: Fran de Paz --- bitnami/kubeapps/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/kubeapps/Chart.yaml b/bitnami/kubeapps/Chart.yaml index ea8b792ef277a3..67813417609717 100644 --- a/bitnami/kubeapps/Chart.yaml +++ b/bitnami/kubeapps/Chart.yaml @@ -52,4 +52,4 @@ maintainers: name: kubeapps sources: - https://github.com/bitnami/charts/tree/main/bitnami/kubeapps -version: 14.0.3 +version: 14.0.2