From 506f9ee45af068f5c57ee0e147c7d2fc8110e421 Mon Sep 17 00:00:00 2001 From: Gian Miguel Del Mundo Date: Mon, 24 Mar 2025 18:46:25 +0800 Subject: [PATCH 1/4] Updated E2E test branch --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index cb7fdff71..3570f20ef 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -117,7 +117,7 @@ on: jobs: e2e-test: name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@gdm-UID2-5040-e2e with: operator_type: ${{ inputs.operator_type }} identity_scope: ${{ inputs.identity_scope }} From 7344e5a523b1eb42b71cc7c329db675db315c407 Mon Sep 17 00:00:00 2001 From: Gian Miguel Del Mundo Date: Tue, 25 Mar 2025 16:03:19 +0800 Subject: [PATCH 2/4] Updated operator shutdown var --- .github/workflows/run-e2e-tests-on-operator.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index 3570f20ef..52132f47e 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -29,10 +29,10 @@ on: - integ - prod operator_shutdown: - description: PRIVATE OPERATORS ONLY - If true, will automatically shut down operators after E2E tests. If false, remember to manually clean up the operator. + description: PRIVATE OPERATORS ONLY - If true, will delay operator shutdown by 24 hours. required: true type: boolean - default: true + default: false operator_image_version: description: 'Image: Operator image version (for gcp/azure, set appropriate image)' type: string @@ -79,10 +79,10 @@ on: description: PRIVATE OPERATORS ONLY - The target environment [mock, integ, prod] type: string default: mock - operator_shutdown: - description: PRIVATE OPERATORS ONLY - If true, will automatically shut down operators after E2E tests. If false, remember to manually clean up the operator. + delay_operator_shutdown: + description: PRIVATE OPERATORS ONLY - If true, will delay operator shutdown by 24 hours. type: boolean - default: true + default: false operator_image_version: description: 'Image: Operator image version (for gcp/azure, set appropriate image)' type: string @@ -122,7 +122,7 @@ jobs: operator_type: ${{ inputs.operator_type }} identity_scope: ${{ inputs.identity_scope }} target_environment: ${{ inputs.target_environment }} - operator_shutdown: ${{ inputs.operator_shutdown }} + delay_operator_shutdown: ${{ inputs.delay_operator_shutdown }} operator_image_version: ${{ inputs.operator_image_version }} core_image_version: ${{ inputs.core_image_version }} optout_image_version: ${{ inputs.optout_image_version }} From 645211a334d17b94134573ab6f2dfa1d9f2491db Mon Sep 17 00:00:00 2001 From: Gian Miguel Del Mundo Date: Tue, 25 Mar 2025 16:05:06 +0800 Subject: [PATCH 3/4] Fixed input --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index 52132f47e..d8ad68e97 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -28,7 +28,7 @@ on: - mock - integ - prod - operator_shutdown: + delay_operator_shutdown: description: PRIVATE OPERATORS ONLY - If true, will delay operator shutdown by 24 hours. required: true type: boolean From cba7abf6d277881d14c46ca02cb7e6fc8dc68814 Mon Sep 17 00:00:00 2001 From: Gian Miguel Del Mundo Date: Tue, 25 Mar 2025 18:23:03 +0800 Subject: [PATCH 4/4] Reverted e2e test workflow branch --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index d8ad68e97..462a992e1 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -117,7 +117,7 @@ on: jobs: e2e-test: name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@gdm-UID2-5040-e2e + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 with: operator_type: ${{ inputs.operator_type }} identity_scope: ${{ inputs.identity_scope }}