From 4685f40d6784355f569b454f5938ddb997142fdb Mon Sep 17 00:00:00 2001 From: "Badr, Nesma" Date: Mon, 14 Oct 2024 16:44:14 +0200 Subject: [PATCH] Fix non-blocking deletion test --- .../action.yml | 6 ++---- .github/workflows/test-e2e-with-modulereleasemeta.yml | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/actions/deploy-template-operator-with-modulereleasemeta/action.yml b/.github/actions/deploy-template-operator-with-modulereleasemeta/action.yml index 75bedc3b52..a2a405a74c 100644 --- a/.github/actions/deploy-template-operator-with-modulereleasemeta/action.yml +++ b/.github/actions/deploy-template-operator-with-modulereleasemeta/action.yml @@ -1,8 +1,5 @@ name: Deploy template-operator With ModuleReleaseMeta description: Deploys a test-specific template-operator and corresponding ModuleReleaseMeta. -inputs: - deploy_modulereleasemeta: - description: A flag to indicate with to apply the ModuleReleaseMeta CR for Template Operator module. runs: using: composite steps: @@ -31,7 +28,6 @@ runs: - name: Apply Template Operator Module and ModuleReleaseMeta for regular and fast channels working-directory: lifecycle-manager if: ${{ matrix.e2e-test == 'module-upgrade-channel-switch' || - matrix.e2e-test == 'module-upgrade-new-version' || matrix.e2e-test == 'upgrade-under-deletion' }} shell: bash @@ -92,6 +88,8 @@ runs: channels: - channel: fast version: 2.4.2-e2e-test + - channel: regular + version: 1.0.1 moduleName: template-operator EOF kubectl apply -f mrm.yaml diff --git a/.github/workflows/test-e2e-with-modulereleasemeta.yml b/.github/workflows/test-e2e-with-modulereleasemeta.yml index 73488c196b..f9e5ba2b55 100644 --- a/.github/workflows/test-e2e-with-modulereleasemeta.yml +++ b/.github/workflows/test-e2e-with-modulereleasemeta.yml @@ -45,7 +45,6 @@ jobs: - purge-controller - purge-metrics - module-upgrade-channel-switch - - module-upgrade-new-version - unmanage-module - skip-manifest-reconciliation - ca-certificate-rotation