From 819b1ffabf5e8c1dd5016c4de55ae086fede3ec9 Mon Sep 17 00:00:00 2001 From: Jakov Sosic Date: Wed, 9 Oct 2024 13:35:03 +0200 Subject: [PATCH] CI: Move jobs from build to main jenkins --- .github/workflows/ci.yaml | 28 ++++++++++----------- .github/workflows/davinci-alpha-package.yml | 12 ++++----- .github/workflows/release.yml | 14 +++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e4cd859899..ef66d97b68 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,7 +48,7 @@ jobs: TOPTAL_BUILD_BOT_SSH_KEY:toptal-ci/TOPTAL_BUILD_BOT_SSH_KEY TOPTAL_DEFAULT_REGISTRY:toptal-ci/TOPTAL_DEFAULT_REGISTRY TOPTAL_DEVBOT_TOKEN:toptal-ci/TOPTAL_DEVBOT_TOKEN - TOPTAL_TRIGGERBOT_BUILD_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_BUILD_TOKEN + TOPTAL_TRIGGERBOT_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_TOKEN TOPTAL_TRIGGERBOT_USERNAME:toptal-ci/TOPTAL_TRIGGERBOT_USERNAME - name: Parse secrets @@ -67,7 +67,7 @@ jobs: echo "HAPPO_API_KEY=${{ steps.parse_secrets.outputs.HAPPO_API_KEY }}" >> $GITHUB_ENV echo "HAPPO_API_SECRET=${{ steps.parse_secrets.outputs.HAPPO_API_SECRET }}" >> $GITHUB_ENV echo "JENKINS_USER=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_USERNAME }}" >> $GITHUB_ENV - echo "JENKINS_BUILD_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_BUILD_TOKEN }}" >> $GITHUB_ENV + echo "JENKINS_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_TOKEN }}" >> $GITHUB_ENV echo "NPM_TOKEN=${{ steps.parse_secrets.outputs.NPM_TOKEN }}" >> $GITHUB_ENV echo 'TOPTAL_BUILD_BOT_SSH_KEY<> $GITHUB_ENV echo '${{ steps.parse_secrets.outputs.TOPTAL_BUILD_BOT_SSH_KEY }}' >> $GITHUB_ENV @@ -107,7 +107,7 @@ jobs: HAPPO_API_SECRET:toptal-ci/PICASSO_HAPPO_API_SECRET NPM_TOKEN:toptal-ci/NPM_TOKEN TOPTAL_DEVBOT_TOKEN:toptal-ci/TOPTAL_DEVBOT_TOKEN - TOPTAL_TRIGGERBOT_BUILD_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_BUILD_TOKEN + TOPTAL_TRIGGERBOT_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_TOKEN TOPTAL_TRIGGERBOT_USERNAME:toptal-ci/TOPTAL_TRIGGERBOT_USERNAME - name: Parse secrets @@ -123,7 +123,7 @@ jobs: echo "HAPPO_API_KEY=${{ steps.parse_secrets.outputs.HAPPO_API_KEY }}" >> $GITHUB_ENV echo "HAPPO_API_SECRET=${{ steps.parse_secrets.outputs.HAPPO_API_SECRET }}" >> $GITHUB_ENV echo "JENKINS_USER=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_USERNAME }}" >> $GITHUB_ENV - echo "JENKINS_BUILD_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_BUILD_TOKEN }}" >> $GITHUB_ENV + echo "JENKINS_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_TOKEN }}" >> $GITHUB_ENV - name: Set up Node.js uses: actions/setup-node@v4 @@ -242,10 +242,10 @@ jobs: HAPPO_API_SECRET:toptal-ci/PICASSO_HAPPO_API_SECRET NPM_TOKEN:toptal-ci/NPM_TOKEN TOPTAL_DEVBOT_TOKEN:toptal-ci/TOPTAL_DEVBOT_TOKEN - TOPTAL_TRIGGERBOT_BUILD_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_BUILD_TOKEN + TOPTAL_TRIGGERBOT_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_TOKEN TOPTAL_TRIGGERBOT_USERNAME:toptal-ci/TOPTAL_TRIGGERBOT_USERNAME - JENKINS_BUILD_URL:toptal-ci/JENKINS_BUILD_URL - JENKINS_BUILD_CLIENT_ID:toptal-ci/JENKINS_BUILD_CLIENT_ID + JENKINS_URL:toptal-ci/JENKINS_URL + JENKINS_CLIENT_ID:toptal-ci/JENKINS_CLIENT_ID JENKINS_SA_CREDENTIALS:toptal-ci/JENKINS_SA_CREDENTIALS TOPTAL_REPOACCESSBOT_TOKEN:toptal-ci/TOPTAL_REPOACCESSBOT_TOKEN @@ -262,7 +262,7 @@ jobs: echo "HAPPO_API_KEY=${{ steps.parse_secrets.outputs.HAPPO_API_KEY }}" >> $GITHUB_ENV echo "HAPPO_API_SECRET=${{ steps.parse_secrets.outputs.HAPPO_API_SECRET }}" >> $GITHUB_ENV echo "JENKINS_USER=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_USERNAME }}" >> $GITHUB_ENV - echo "JENKINS_BUILD_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_BUILD_TOKEN }}" >> $GITHUB_ENV + echo "JENKINS_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_TOKEN }}" >> $GITHUB_ENV - name: Get toptal/actions uses: actions/checkout@v4 @@ -283,10 +283,10 @@ jobs: BRANCH: ${{ github.event.pull_request.head.ref }} PR_ID: ${{ github.event.pull_request.number }} with: - jenkins_url: ${{ steps.parse_secrets.outputs.JENKINS_BUILD_URL }} + jenkins_url: ${{ steps.parse_secrets.outputs.JENKINS_URL }} jenkins_user: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_USERNAME }} - jenkins_token: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_BUILD_TOKEN }} - jenkins_client_id: ${{ steps.parse_secrets.outputs.JENKINS_BUILD_CLIENT_ID }} + jenkins_token: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_TOKEN }} + jenkins_client_id: ${{ steps.parse_secrets.outputs.JENKINS_CLIENT_ID }} jenkins_sa_credentials: ${{ steps.parse_secrets.outputs.JENKINS_SA_CREDENTIALS }} job_name: picasso-docs job_params: | @@ -300,10 +300,10 @@ jobs: uses: ./.github/actions/create-jira-deployment/ if: ${{ always() }} with: - jenkins_url: ${{ steps.parse_secrets.outputs.JENKINS_BUILD_URL }} + jenkins_url: ${{ steps.parse_secrets.outputs.JENKINS_URL }} jenkins_user: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_USERNAME }} - jenkins_token: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_BUILD_TOKEN }} - jenkins_client_id: ${{ steps.parse_secrets.outputs.JENKINS_BUILD_CLIENT_ID }} + jenkins_token: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_TOKEN }} + jenkins_client_id: ${{ steps.parse_secrets.outputs.JENKINS_CLIENT_ID }} jenkins_sa_credentials: ${{ steps.parse_secrets.outputs.JENKINS_SA_CREDENTIALS }} token: ${{ env.TOPTAL_DEVBOT_TOKEN }} environment: staging diff --git a/.github/workflows/davinci-alpha-package.yml b/.github/workflows/davinci-alpha-package.yml index 4c0055d102..90ae0998ee 100644 --- a/.github/workflows/davinci-alpha-package.yml +++ b/.github/workflows/davinci-alpha-package.yml @@ -28,13 +28,13 @@ jobs: workload_identity_provider: ${{ secrets.IDENTITY_POOL }} service_account: ${{ secrets.SA_IDENTITY_POOL }} secrets_name: |- - JENKINS_BUILD_CLIENT_ID:toptal-ci/JENKINS_BUILD_CLIENT_ID - JENKINS_BUILD_URL:toptal-ci/JENKINS_BUILD_URL + JENKINS_CLIENT_ID:toptal-ci/JENKINS_CLIENT_ID + JENKINS_URL:toptal-ci/JENKINS_URL JENKINS_SA_CREDENTIALS:toptal-ci/JENKINS_SA_CREDENTIALS NPM_TOKEN_PUBLISH:toptal-ci/NPM_TOKEN_PUBLISH TOPTAL_DEVBOT_TOKEN:toptal-ci/TOPTAL_DEVBOT_TOKEN TOPTAL_REPOACCESSBOT_TOKEN:toptal-ci/TOPTAL_REPOACCESSBOT_TOKEN - TOPTAL_TRIGGERBOT_BUILD_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_BUILD_TOKEN + TOPTAL_TRIGGERBOT_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_TOKEN TOPTAL_TRIGGERBOT_USERNAME:toptal-ci/TOPTAL_TRIGGERBOT_USERNAME - name: Parse secrets @@ -152,10 +152,10 @@ jobs: - name: Create Jira deployment uses: ./.github/actions/create-jira-deployment/ with: - jenkins_url: ${{ steps.parse_secrets.outputs.JENKINS_BUILD_URL }} + jenkins_url: ${{ steps.parse_secrets.outputs.JENKINS_URL }} jenkins_user: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_USERNAME }} - jenkins_token: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_BUILD_TOKEN }} - jenkins_client_id: ${{ steps.parse_secrets.outputs.JENKINS_BUILD_CLIENT_ID }} + jenkins_token: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_TOKEN }} + jenkins_client_id: ${{ steps.parse_secrets.outputs.JENKINS_CLIENT_ID }} jenkins_sa_credentials: ${{ steps.parse_secrets.outputs.JENKINS_SA_CREDENTIALS }} token: ${{ env.GITHUB_TOKEN }} environment: development diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a201cdafd..14b7a9e2e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,13 +43,13 @@ jobs: TOPTAL_DEFAULT_REGISTRY:toptal-ci/TOPTAL_DEFAULT_REGISTRY TOPTAL_DEVBOT_TOKEN:toptal-ci/TOPTAL_DEVBOT_TOKEN TOPTAL_REPOACCESSBOT_TOKEN:toptal-ci/TOPTAL_REPOACCESSBOT_TOKEN - TOPTAL_TRIGGERBOT_BUILD_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_BUILD_TOKEN + TOPTAL_TRIGGERBOT_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_TOKEN TOPTAL_TRIGGERBOT_DEPLOYMENT_TOKEN:toptal-ci/TOPTAL_TRIGGERBOT_DEPLOYMENT_TOKEN TOPTAL_TRIGGERBOT_USERNAME:toptal-ci/TOPTAL_TRIGGERBOT_USERNAME JENKINS_DEPLOYMENT_CLIENT_ID:toptal-ci/JENKINS_DEPLOYMENT_CLIENT_ID JENKINS_DEPLOYMENT_URL:toptal-ci/JENKINS_DEPLOYMENT_URL - JENKINS_BUILD_CLIENT_ID:toptal-ci/JENKINS_BUILD_CLIENT_ID - JENKINS_BUILD_URL:toptal-ci/JENKINS_BUILD_URL + JENKINS_CLIENT_ID:toptal-ci/JENKINS_CLIENT_ID + JENKINS_URL:toptal-ci/JENKINS_URL JENKINS_SA_CREDENTIALS:toptal-ci/JENKINS_SA_CREDENTIALS - name: Parse secrets @@ -65,7 +65,7 @@ jobs: echo "SLACK_BOT_TOKEN=${{ steps.parse_secrets.outputs.SLACK_BOT_TOKEN }}" >> $GITHUB_ENV echo "TOPTAL_BOT_USERNAME=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_USERNAME }}" >> $GITHUB_ENV echo "TOPTAL_BOT_JENKINS_DEPLOYMENT_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_DEPLOYMENT_TOKEN }}" >> $GITHUB_ENV - echo "TOPTAL_JENKINS_BUILD_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_BUILD_TOKEN }}" >> $GITHUB_ENV + echo "TOPTAL_JENKINS_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_TOKEN }}" >> $GITHUB_ENV echo "DEVBOT_TOKEN=${{ steps.parse_secrets.outputs.TOPTAL_DEVBOT_TOKEN }}" >> $GITHUB_ENV echo 'GCR_ACCOUNT_KEY<> $GITHUB_ENV echo '${{ steps.parse_secrets.outputs.GCR_ACCOUNT_KEY }}' >> $GITHUB_ENV @@ -225,10 +225,10 @@ jobs: uses: ./.github/actions/create-jira-deployment/ if: ${{ steps.changesets.outputs.published == 'true' }} with: - jenkins_url: ${{ steps.parse_secrets.outputs.JENKINS_BUILD_URL }} + jenkins_url: ${{ steps.parse_secrets.outputs.JENKINS_URL }} jenkins_user: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_USERNAME }} - jenkins_token: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_BUILD_TOKEN }} - jenkins_client_id: ${{ steps.parse_secrets.outputs.JENKINS_BUILD_CLIENT_ID }} + jenkins_token: ${{ steps.parse_secrets.outputs.TOPTAL_TRIGGERBOT_TOKEN }} + jenkins_client_id: ${{ steps.parse_secrets.outputs.JENKINS_CLIENT_ID }} jenkins_sa_credentials: ${{ steps.parse_secrets.outputs.JENKINS_SA_CREDENTIALS }} token: ${{ env.DEVBOT_TOKEN }} environment: production