From 2a2123fc11725e6f98305c72be10b5fbf2bf4d49 Mon Sep 17 00:00:00 2001
From: zhou-yinyuan <147299494+zhou-yinyuan@users.noreply.github.com>
Date: Fri, 27 Sep 2024 10:04:44 +0800
Subject: [PATCH] ADM-1005 [frontend][backend]: fix e2e test in the buildkite
 and github (#1614)

* ADM-1005 [frontend]: fix the bug when pipeline settings exist in the redux but user select Other in the pipeline configuration

* ADM-1005 [frontend]: fix test coverage

* ADM-1005 [frontend][backend]: update the pipeline csv file

* ADM-1005 [frontend][backend]: fix test

* ADM-1005 [frontend]: fix e2e test

* ADM-1005 [frontend]: add a test for with pipeline and source control configuration

* ADM-1005 [frontend]: format

* ADM-1005 [frontend]: format

* ADM-1005 [frontend][backend]: fix e2e test in the buildkite and github
---
 .github/workflows/build-and-deploy.yml | 5 +++++
 ops/check.sh                           | 1 +
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index fbf4c96ed..387431dbc 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -476,6 +476,7 @@ jobs:
           E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
           E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
           E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL: ${{ secrets.E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL }}
           E2E_PROJECT: "Google Chrome"
         shell: bash {0}
         run: ./ops/check.sh e2e
@@ -505,6 +506,7 @@ jobs:
           E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
           E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
           E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL: ${{ secrets.E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL }}
           E2E_PROJECT: ${{ env.E2E_PLATFORM }}
         shell: bash {0}
         run: ./ops/check.sh e2e
@@ -535,6 +537,7 @@ jobs:
           E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
           E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
           E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL: ${{ secrets.E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL }}
           E2E_PROJECT: ${{ env.E2E_PLATFORM }}
         shell: bash {0}
         run: ./ops/check.sh e2e
@@ -565,6 +568,7 @@ jobs:
           E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
           E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
           E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL: ${{ secrets.E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL }}
           E2E_PROJECT: ${{ env.E2E_PLATFORM }}
         shell: bash {0}
         run: ./ops/check.sh e2e
@@ -594,6 +598,7 @@ jobs:
           E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
           E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
           E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL: ${{ secrets.E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL }}
           E2E_PROJECT: ${{ env.E2E_PLATFORM }}
         shell: bash {0}
         run: ./ops/check.sh e2e
diff --git a/ops/check.sh b/ops/check.sh
index 8977d4ef1..a648d3fde 100755
--- a/ops/check.sh
+++ b/ops/check.sh
@@ -277,6 +277,7 @@ e2e_container_check() {
     -e "E2E_TOKEN_GITHUB=${E2E_TOKEN_GITHUB:-}" \
     -e "CI=${CI:-}" \
     -e "E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE=${E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE:-}" \
+    -e "E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL=${E2E_TOKEN_GITHUB_WITH_OTHER_SOURCE_CONTROL:-}" \
     heartbeat_e2e:latest \
     pnpm run e2e:major-ci
   result=$?