test

Signed-off-by: willdavsmith <willdavsmith@gmail.com>
willdavsmith · Mar 6, 2024 · cb946bc · cb946bc
1 parent 61512df
commit cb946bc
Showing 1 changed file with 34 additions and 28 deletions.
diff --git a/.github/workflows/functional-test.yaml b/.github/workflows/functional-test.yaml
@@ -112,7 +112,7 @@ jobs:
         if: github.event_name == 'workflow_run'
         uses: actions/github-script@v6
         with:
-          github-token: ${{ secrets.GH_RAD_CI_BOT_PAT }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const payload = context.payload.workflow_run;
             let fs = require('fs');
@@ -125,7 +125,7 @@ jobs:
         if: github.event_name == 'repository_dispatch'
         uses: actions/github-script@v6
         with:
-          github-token: ${{ secrets.GH_RAD_CI_BOT_PAT }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const clientPayload = context.payload.client_payload;
             if (clientPayload && clientPayload.event_type === `de-functional-test`) {
@@ -168,7 +168,7 @@ jobs:
         if: env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           hide: true
@@ -203,17 +203,17 @@ jobs:
             </details>
             
             ## Test Status
-      - name: 
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GH_RAD_CI_BOT_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - uses: marocchino/sticky-pull-request-comment@v2
         if: env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -235,7 +235,7 @@ jobs:
         if: success() && env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -245,7 +245,7 @@ jobs:
         if: failure() && env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -255,7 +255,7 @@ jobs:
         if: env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -278,7 +278,7 @@ jobs:
         if: success() && env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -288,7 +288,7 @@ jobs:
         if: failure() && env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -322,6 +322,12 @@ jobs:
     outputs:
       test_status: ${{ steps.report_test_status.outputs.test_status }}
     steps:
+      - name: Login as the GitHub App
+        uses: tibdex/github-app-token@v1
+        id: get_installation_token
+        with: 
+          app_id: ${{ secrets.FUNCTIONAL_TEST_APP_ID }}
+          private_key: ${{ secrets.FUNCTIONAL_TEST_APP_PRIVATE_KEY }}
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -360,17 +366,17 @@ jobs:
         uses: azure/login@v1
         with:
           creds: '{"clientId":"${{ secrets.INTEGRATION_TEST_SP_APP_ID }}","clientSecret":"${{ secrets.INTEGRATION_TEST_SP_PASSWORD }}","subscriptionId":"${{ secrets.INTEGRATION_TEST_SUBSCRIPTION_ID }}","tenantId":"${{ secrets.INTEGRATION_TEST_TENANT_ID }}"}'
-      # - name: Create azure resource group - ${{ env.AZURE_TEST_RESOURCE_GROUP }}
-      #   run: |
-      #     current_time=$(date +%s)
-      #     az group create \
-      #       --location ${{ env.AZURE_LOCATION }} \
-      #       --name $RESOURCE_GROUP \
-      #       --subscription ${{ secrets.INTEGRATION_TEST_SUBSCRIPTION_ID }} \
-      #       --tags creationTime=$current_time
-      #     while [ $(az group exists --name $RESOURCE_GROUP) = false ]; do sleep 2; done
-      #   env:
-      #     RESOURCE_GROUP: ${{ env.AZURE_TEST_RESOURCE_GROUP }}
+      - name: Create azure resource group - ${{ env.AZURE_TEST_RESOURCE_GROUP }}
+        run: |
+          current_time=$(date +%s)
+          az group create \
+            --location ${{ env.AZURE_LOCATION }} \
+            --name $RESOURCE_GROUP \
+            --subscription ${{ secrets.INTEGRATION_TEST_SUBSCRIPTION_ID }} \
+            --tags creationTime=$current_time
+          while [ $(az group exists --name $RESOURCE_GROUP) = false ]; do sleep 2; done
+        env:
+          RESOURCE_GROUP: ${{ env.AZURE_TEST_RESOURCE_GROUP }}
       - uses: azure/setup-helm@v3
         with:
           version: ${{ env.HELM_VER }}
@@ -385,7 +391,7 @@ jobs:
           # AZURE_OIDC_ISSUER
           eval "export $(echo "${{ secrets.FUNCTEST_AZURE_OIDC_JSON }}" | jq -r 'to_entries | map("\(.key)=\(.value)") | @sh')"
 
-          AUTHKEY=$(echo -n "${{ github.actor }}:${{ secrets.GH_RAD_CI_BOT_PAT }}" | base64)
+          AUTHKEY=$(echo -n "${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}" | base64)
           echo "{\"auths\":{\"ghcr.io\":{\"auth\":\"${AUTHKEY}\"}}}" > "./ghcr_secret.json"
 
           # Create KinD cluster with OIDC Issuer keys
@@ -442,7 +448,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GH_RAD_CI_BOT_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Install Radius
         run: |
           export PATH=$GITHUB_WORKSPACE/bin:$PATH
@@ -558,7 +564,7 @@ jobs:
         if: success() && env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -568,7 +574,7 @@ jobs:
         if: failure() && env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -578,7 +584,7 @@ jobs:
         if: cancelled() && env.PR_NUMBER != ''
         continue-on-error: true
         with:
-          GH_RAD_CI_BOT_PAT: ${{ steps.get_installation_token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.get_installation_token.outputs.token }}
           header: teststatus-${{ github.run_id }}
           number: ${{ env.PR_NUMBER }}
           append: true
@@ -628,7 +634,7 @@ jobs:
       - name: Create failure issue for failing scheduled run
         uses: actions/github-script@v6
         with:
-          github-token: ${{ secrets.GH_RAD_CI_BOT_PAT }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             github.rest.issues.create({
               ...context.repo,