From 8db543aed01380221ffa95023f2f668638118230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Schw=C3=A4gerl?= Date: Fri, 24 Jan 2025 15:13:57 +0100 Subject: [PATCH] add e2e test for regular modules --- .github/actions/deploy-lifecycle-manager-e2e/action.yml | 3 ++- .github/actions/deploy-template-operator/action.yml | 4 ++++ .github/workflows/test-e2e.yml | 1 + tests/e2e/Makefile | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/actions/deploy-lifecycle-manager-e2e/action.yml b/.github/actions/deploy-lifecycle-manager-e2e/action.yml index 758bf3b535..6c10f02898 100644 --- a/.github/actions/deploy-lifecycle-manager-e2e/action.yml +++ b/.github/actions/deploy-lifecycle-manager-e2e/action.yml @@ -98,7 +98,8 @@ runs: kustomize edit add patch --path certificate_renewal.yaml --kind Certificate --group cert-manager.io --version v1 --name watcher-serving popd - name: Create and use maintenance window policy - if: ${{matrix.e2e-test == 'modulereleasemeta-maintenance-window-with-module-downtime'}} + if: ${{matrix.e2e-test == 'modulereleasemeta-maintenance-window-with-module-downtime' || + matrix.e2e-test == 'maintenance-window-with-module-downtime'}} working-directory: lifecycle-manager/config shell: bash run: | diff --git a/.github/actions/deploy-template-operator/action.yml b/.github/actions/deploy-template-operator/action.yml index 12b40db7a3..4c69c25d89 100644 --- a/.github/actions/deploy-template-operator/action.yml +++ b/.github/actions/deploy-template-operator/action.yml @@ -36,6 +36,10 @@ runs: }} shell: bash run: | + if [ "${{ matrix.e2e-test }}" == "maintenance-window-with-module-downtime" ]; then + yq e '.spec.requiresDowntime = true' -i tests/e2e/moduletemplate/moduletemplate_template_operator_v2_fast.yaml + fi + kubectl apply -f tests/e2e/moduletemplate/moduletemplate_template_operator_v2_fast.yaml kubectl apply -f tests/e2e/moduletemplate/moduletemplate_template_operator_v1_regular.yaml - name: Create Template Operator Module for installation by version diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 7dbdf594a9..4453d346a4 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -64,6 +64,7 @@ jobs: - rbac-privileges - ocm-compatible-module-template - labelling + - maintenance-window-with-module-downtime runs-on: ubuntu-latest timeout-minutes: 20 steps: diff --git a/tests/e2e/Makefile b/tests/e2e/Makefile index bc54afa9e7..cb36ab4c6a 100644 --- a/tests/e2e/Makefile +++ b/tests/e2e/Makefile @@ -174,3 +174,6 @@ labelling: modulereleasemeta-maintenance-window-with-module-downtime: go test -timeout 20m -ginkgo.v -ginkgo.focus "Maintenance Window With ModuleReleaseMeta and Module Downtime" + +maintenance-window-with-module-downtime: + go test -timeout 20m -ginkgo.v -ginkgo.focus "Maintenance Window With ModuleReleaseMeta and Module Downtime"