fix

pingcap · Oct 9, 2024 · 3098bd9 · 3098bd9
1 parent 25f2390
commit 3098bd9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/.github/actions/decide/action.yml b/.github/actions/decide/action.yml
@@ -14,10 +14,10 @@ outputs:
     description: Should build frontend
   should-build-backend:
     description: Should build backend
-  e2e-reuse-frontend:
-    description: Frontend docker version (false or string)
-  e2e-reuse-backend:
-    description: Frontend docker version (false or string)
+  e2e-frontend:
+    description: Frontend docker version
+  e2e-backend:
+    description: Frontend docker version
 runs:
   using: 'node20'
   main: 'index.js'
diff --git a/.github/actions/decide/index.js b/.github/actions/decide/index.js
@@ -5,33 +5,35 @@ const FRONTEND_PREFIX = core.getInput('pr-e2e-frontend-label-prefix', { required
 const BACKEND_PREFIX = core.getInput('pr-e2e-backend-label-prefix', { required: true });
 
 function run() {
+  const defaultImageVersion = `sha-${context.sha}-dev`
+
   if (context.eventName !== 'pull_request') {
     // Build and run E2E for all other events.
     // TODO: Maybe handle commit message like "feat(frontend-only): Some message"
 
     core.setOutput('should-build-frontend', true);
     core.setOutput('should-build-backend', true);
-    core.setOutput('e2e-reuse-frontend', false);
-    core.setOutput('e2e-reuse-backend', false);
+    core.setOutput('e2e-frontend', defaultImageVersion);
+    core.setOutput('e2e-backend', defaultImageVersion);
     return;
   }
 
   let label
   if (!!(label = findPRLabel(label => label.name.startsWith(FRONTEND_PREFIX)))) {
     core.setOutput('should-build-frontend', false);
-    core.setOutput('e2e-reuse-frontend', label.name.slice(FRONTEND_PREFIX.length));
-    core.info(`E2E Frontend reuse: ${label.name.slice(FRONTEND_PREFIX.length)}`);
+    core.setOutput('e2e-frontend', label.name.slice(FRONTEND_PREFIX.length));
+    core.info(`E2E Frontend: ${label.name.slice(FRONTEND_PREFIX.length)}`);
   } else {
     core.setOutput('should-build-frontend', true);
-    core.setOutput('e2e-reuse-frontend', false);
+    core.setOutput('e2e-frontend', defaultImageVersion);
   }
   if (!!(label = findPRLabel(label => label.name.startsWith(BACKEND_PREFIX)))) {
     core.setOutput('should-build-backend', false);
-    core.setOutput('e2e-reuse-backend', label.name.slice(BACKEND_PREFIX.length));
-    core.info(`E2E Backend reuse: ${label.name.slice(BACKEND_PREFIX.length)}`);
+    core.setOutput('e2e-backend', label.name.slice(BACKEND_PREFIX.length));
+    core.info(`E2E Backend: ${label.name.slice(BACKEND_PREFIX.length)}`);
   } else {
     core.setOutput('should-build-backend', true);
-    core.setOutput('e2e-reuse-backend', false);
+    core.setOutput('e2e-backend', defaultImageVersion);
   }
 }
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,8 +39,8 @@ jobs:
           ${{(startsWith(github.ref, 'refs/tags/') && 'linux/arm64') || ''}}
         should-build-frontend: ${{steps.decide.outputs.should-build-frontend}}
         should-build-backend: ${{steps.decide.outputs.should-build-backend}}
-        e2e-reuse-frontend: ${{steps.decide.outputs.e2e-reuse-frontend}}
-        e2e-reuse-backend: ${{steps.decide.outputs.e2e-reuse-backend}}
+        e2e-frontend: ${{steps.decide.outputs.e2e-frontend}}
+        e2e-backend: ${{steps.decide.outputs.e2e-backend}}
       permissions:
         contents: read
       steps:
@@ -170,18 +170,19 @@ jobs:
           run: npm ci
 
         - name: Install Playwright Browsers
-          run: npx playwright install --with-deps
+          run: npx playwright install --with-deps chromium
 
         - name: Fetch Images
           run: ./prepare-test.sh
           env:
-            E2E_DOCKER_TAG: sha-${{ github.sha }}-dev
+            E2E_DOCKER_TAG_FRONTEND: ${{ needs.docker-metadata.outputs.e2e-frontend}}
+            E2E_DOCKER_TAG_BACKEND: ${{ needs.docker-metadata.outputs.e2e-backend}}
 
         - name: Run tests
           run: ./start-test.sh
           env:
-            E2E_DOCKER_TAG_FRONTEND: ${{ needs.docker-metadata.outputs.e2e-reuse-frontend || format('sha-{0}-dev', github.sha) }}
-            E2E_DOCKER_TAG_BACKEND: ${{ needs.docker-metadata.outputs.e2e-reuse-backend || format('sha-{0}-dev', github.sha) }}
+            E2E_DOCKER_TAG_FRONTEND: ${{ needs.docker-metadata.outputs.e2e-frontend}}
+            E2E_DOCKER_TAG_BACKEND: ${{ needs.docker-metadata.outputs.e2e-backend}}
             E2E_LLM_PROVIDER: ${{vars.E2E_LLM_PROVIDER}}
             E2E_LLM_MODEL: ${{vars.E2E_LLM_MODEL || ''}}
             E2E_LLM_CREDENTIALS: ${{secrets.E2E_LLM_CREDENTIALS}}

diff --git a/e2e/start-test.sh b/e2e/start-test.sh
@@ -14,6 +14,8 @@ echo -e "$TAG Creating temp dir"
 export E2E_DATA_STORAGE_DIR=$(mktemp -d "${TMPDIR:-/tmp/}"/tidbai-storage.XXXXXXXX | sed 's#//#/#g')
 export E2E_DATA_REDIS_DIR=$(mktemp -d "${TMPDIR:-/tmp/}"/tidbai-redis.XXXXXXXX | sed 's#//#/#g')
 export E2E_DATA_TIDB_DIR=$(mktemp -d "${TMPDIR:-/tmp/}"/tidbai-storage.XXXXXXXX | sed 's#//#/#g')
+echo E2E_DOCKER_TAG_FRONTEND: ${E2E_DOCKER_TAG_FRONTEND}
+echo E2E_DOCKER_TAG_BACKEND: ${E2E_DOCKER_TAG_BACKEND}
 echo E2E_DATA_STORAGE_DIR: ${E2E_DATA_STORAGE_DIR}
 echo E2E_DATA_REDIS_DIR: ${E2E_DATA_REDIS_DIR}
 echo E2E_DATA_TIDB_DIR: ${E2E_DATA_TIDB_DIR}