Merge pull request #295 from fingerprintjs/ci/fix-rc-e2e-tests

ci: make release test pipeline use commit with tag INTER-924

Author: necipallef

.github/workflows/e2e_test_for_prs.yml

@@ -1,6 +1,9 @@
-name: Run e2e for topic branch
+name: Run AWS E2E for topic branch
+
 on:
   pull_request:
+    branches:
+      - rc
 
 jobs:
   check-changed-files:

.github/workflows/e2e_test_for_release_check.yml

@@ -0,0 +1,45 @@
+name: Check AWS E2E for releases and pre-releases
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  check-commit-with-tag-and-old-tests:
+    runs-on: ubuntu-20.04
+    name: Check latest commit with tag and its checks
+    steps:
+      - name: 'Install latest node version'
+        uses: actions/setup-node@v4
+
+      - name: Git clone
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Check latest commit with tag
+        id: latest_commit_with_test
+        run: |
+          diff=$(git log origin/$GITHUB_BASE_REF..HEAD --oneline --format="%H")
+          echo "diff=$diff"
+          latestCommitWithTag=''
+          for commit in $diff; do
+            echo "checking commit $commit for tag"
+            tag=$(git tag --points-at "$commit")
+            if [[ -n "$tag" ]]; then
+              latestCommitWithTag=$commit
+              break
+            fi
+          done
+          echo "latestCommitWithTag=$latestCommitWithTag"
+          echo "latestCommitWithTag=$latestCommitWithTag" >> $GITHUB_OUTPUT
+          if [[ -z "$latestCommitWithTag" ]]; then
+            echo "no tag has found. Skipping..."
+          fi
+
+      - name: Poll checks from GitHub
+        if: steps.latest_commit_with_test.outputs.latestCommitWithTag != ''
+        run: node scripts/checkCommitStatusForE2E.mjs
+        env:
+          COMMIT_SHA: ${{ steps.latest_commit_with_test.outputs.latestCommitWithTag }}
+          GITHUB_REPOSITORY: ${{ github.repository }}

.github/workflows/e2e_test_for_releases.yml

@@ -1,33 +1,34 @@
-name: AWS E2E for releases and pre-releases
+name: Run AWS E2E for releases and pre-releases
 
 on:
   workflow_dispatch:
   push:
     tags:
       - v*
-    paths-ignore:
-      - '**.md'
-      - 'cloudformation/*.yml'
-
-permissions:
-  id-token: write # This is required for requesting the JWT
-  contents: read  # This is required for actions/checkout
 
 jobs:
   run-e2e-for-releases-and-pre-releases:
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read  # This is required for actions/checkout
     name: Run e2e for releases and pre-releases
     runs-on: ubuntu-latest
     steps:
       - name: Git clone
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: configure AWS credentials
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 #v4.0.2
         with:
           role-to-assume: ${{secrets.AWS_E2E_ROLE_ARN}}
           aws-region: ${{vars.AWS_E2E_REGION}}
       - name: Trigger AWS CodePipeline
         run: |
-          codepipeline_execution_id=$(aws codepipeline start-pipeline-execution --name ${{vars.AWS_E2E_RC_CODEPIPELINE_NAME}} --query 'pipelineExecutionId' --output text)
+          commit=${{ github.sha }}
+          tag=$(git tag --points-at "$commit")
+          echo "Running tests for tag: $tag and commit SHA: $commit"
+          codepipeline_execution_id=$(aws codepipeline start-pipeline-execution --name ${{vars.AWS_E2E_RC_CODEPIPELINE_NAME}} --source-revisions actionName=Source,revisionType=COMMIT_ID,revisionValue=$commit --query 'pipelineExecutionId' --output text)
           echo "Pipeline execution ID: $codepipeline_execution_id"
           echo "codepipeline_execution_id=$codepipeline_execution_id" >> $GITHUB_ENV
       - name: Poll Pipeline Status
@@ -52,3 +53,13 @@ jobs:
             fi
 
           done
+      - name: Output Pipeline Link
+        if: always()
+        run: |
+          region=${{ vars.AWS_E2E_REGION }}
+          pipeline_name=${{ vars.AWS_E2E_RC_CODEPIPELINE_NAME }}
+          execution_id=${{ env.codepipeline_execution_id }}
+          pipeline_url="https://${region}.console.aws.amazon.com/codesuite/codepipeline/pipelines/${pipeline_name}/executions/${execution_id}?region=${region}"
+          echo "AWS CodePipeline Execution URL: $pipeline_url"
+          echo "## AWS CodePipeline Execution Link" >> $GITHUB_STEP_SUMMARY
+          echo "[$pipeline_url]($pipeline_url)" >> $GITHUB_STEP_SUMMARY

buildspec-e2e-rc.yml

@@ -15,21 +15,21 @@ phases:
       - export PATH=$PATH:$HOME/.pulumi/bin
       - pulumi version
       - pnpm install
-      - cd e2e/tests && npx playwright install --with-deps && cd ../..
+      - cd e2e/tests && npx playwright install --with-deps && cd -
       - pnpm -C e2e/website install && pnpm -C e2e/website build
       - UNPACK_TO_DIST=true node scripts/downloadGithubRelease.mjs
   pre_build:
     commands:
       - pwd
       - pulumi version
-      - cd e2e/infra/lambda && pulumi stack init e2e && pulumi stack select e2e && cd ../../..
-      - cd e2e/infra/cloudfront && pulumi stack init e2e && pulumi stack select e2e && cd ../../..
-      - cd e2e/infra && pnpm run lambda:up && pnpm run lambda:export && pnpm run cloudfront:up && pnpm run cloudfront:export && cd ../..
+      - cd e2e/infra/lambda && pulumi stack init e2e && pulumi stack select e2e && cd -
+      - cd e2e/infra/cloudfront && pulumi stack init e2e && pulumi stack select e2e && cd -
+      - cd e2e/infra && pnpm run lambda:up && pnpm run lambda:export && pnpm run cloudfront:up && pnpm run cloudfront:export && cd -
   build:
     commands:
       - ls -a
       - cd e2e/tests && pnpm test
     finally:
-      - cd ../..
+      - cd -
       - echo $COMMIT_ID
-      - cd e2e/infra && pnpm cloudfront:destroy && pnpm lambda:destroy && cd ../..
+      - cd e2e/infra && pnpm cloudfront:destroy && pnpm lambda:destroy && cd -

scripts/checkCommitStatusForE2E.mjs

@@ -0,0 +1,66 @@
+const commitSHA = process.env.COMMIT_SHA
+const gitHubRepo = process.env.GITHUB_REPOSITORY
+
+const apiURL = `repos/${gitHubRepo}/commits/${commitSHA}/check-runs`
+const fullURL = `https://api.github.com/${apiURL}`
+
+const E2E_TEST_NAME = "Run e2e for releases and pre-releases"
+const POLL_WAIT_DURATION = 30_000
+
+function checkEnv() {
+  if (!commitSHA) {
+    throw new Error("env var COMMIT_SHA not found.")
+  }
+
+  console.log(`COMMIT_SHA=${commitSHA}`)
+
+  if (!gitHubRepo) {
+    throw new Error("env var GITHUB_REPOSITORY not found.")
+  }
+
+  console.log(`GITHUB_REPOSITORY=${gitHubRepo}`)
+}
+
+async function wait(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
+
+async function findCheckRun() {
+  const response = await fetch(fullURL)
+  if (!response.ok) {
+    throw new Error(`request to GitHub failed with HTTP ${response.status}.`)
+  }
+
+  const responseBody = await response.json()
+  console.log(`# of check runs: ${responseBody.check_runs.length}`)
+  return responseBody.check_runs.find(r => r.name === E2E_TEST_NAME)
+}
+
+async function main() {
+  checkEnv()
+
+  while (true) {
+    const checkRun = await findCheckRun()
+    if (checkRun) {
+      const conclusion = checkRun.conclusion
+      console.log(`conclusion=${conclusion}`)
+      if (conclusion === "success") {
+        break
+      }
+
+      if (conclusion === "failure") {
+        throw new Error("e2e test has failed. Exiting")
+      }
+    }
+
+    await wait(POLL_WAIT_DURATION)
+  }
+
+  console.log("e2e test has passed! Exiting")
+}
+
+
+main().catch((err) => {
+  console.error(err)
+  process.exit(1)
+})