From 931694d4e99553c73555de2c14e298ab3eaa92a4 Mon Sep 17 00:00:00 2001 From: Davin Chia Date: Mon, 28 Mar 2022 13:09:37 +0800 Subject: [PATCH] Clean up the build tokens and use the OSS build runner. (#11451) Similar to airbytehq/airbyte-cloud#1271. Remove the octavia build token. Use the OSS build token. After this change: - Make it so the connector_base, frontend_build and platform_build are on airbyteio pat. - The rest of the builds are on the oss build runner pat. - Davin's tokens are used for the slash command builds. - Octavia token is only used for administrative stuff. --- .github/workflows/gradle.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a0d387aef9c9..9ba4d57dc45f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -291,7 +291,7 @@ jobs: with: aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }} - github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN_1 }} + github-token: ${{ secrets.AIRBYTEIO_PAT }} frontend-build: name: "Frontend: Build" needs: start-frontend-runner @@ -396,7 +396,7 @@ jobs: uses: supertopher/ec2-github-runner@v15.0.4 with: mode: stop - github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN_1 }} + github-token: ${{ secrets.AIRBYTEIO_PAT }} label: ${{ needs.start-frontend-runner.outputs.label }} ec2-instance-id: ${{ needs.start-frontend-runner.outputs.ec2-instance-id }} @@ -562,7 +562,7 @@ jobs: with: aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }} - github-token: ${{ secrets.AIRBYTEIO_PAT }} + github-token: ${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} platform-new-scheduler-acceptance: # In case of self-hosted EC2 errors, remove the next two lines and uncomment the currently commented out `runs-on` line. needs: start-platform-new-scheduler-acceptance-runner # required to start the main job when the runner is ready @@ -661,7 +661,7 @@ jobs: uses: supertopher/ec2-github-runner@v15.0.4 with: mode: stop - github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN_1 }} + github-token: ${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} label: ${{ needs.start-platform-new-scheduler-acceptance-runner.outputs.label }} ec2-instance-id: ${{ needs.start-platform-new-scheduler-acceptance-runner.outputs.ec2-instance-id }} @@ -689,7 +689,7 @@ jobs: ec2-image-id: ami-0c1a9bc22624339d8 aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }} - github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN_1 }} + github-token: ${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} kube-acceptance-test: name: "Platform: Acceptance Tests (Kube)" # In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest. @@ -827,7 +827,7 @@ jobs: uses: supertopher/ec2-github-runner@v15.0.4 with: mode: stop - github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN_1 }} + github-token: ${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} label: ${{ needs.start-kube-acceptance-test-runner.outputs.label }} ec2-instance-id: ${{ needs.start-kube-acceptance-test-runner.outputs.ec2-instance-id }} @@ -855,7 +855,7 @@ jobs: ec2-image-id: ami-0c1a9bc22624339d8 aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }} - github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN_1 }} + github-token: ${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} kube-acceptance-test-v2: name: "Platform: Acceptance Tests (Kube v2)" # In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest. @@ -960,6 +960,6 @@ jobs: uses: supertopher/ec2-github-runner@v15.0.4 with: mode: stop - github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN_1 }} + github-token: ${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} label: ${{ needs.start-kube-acceptance-test-runner-v2.outputs.label }} ec2-instance-id: ${{ needs.start-kube-acceptance-test-runner-v2.outputs.ec2-instance-id }}