update

radixdlt · May 20, 2024 · 9b18a01 · 9b18a01
1 parent 244a020
commit 9b18a01
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/.github/workflows/jenkins-deployment.yml b/.github/workflows/jenkins-deployment.yml
@@ -30,6 +30,10 @@ on:
       aws_eks_cluster:
         default: "rdx-works-main-dev"
         type: string
+      aws_iam_role_name:
+        default: "jenkins-radquest-pr-deployer"
+        required: true
+        type: string
       helm_dir:
         default: "deploy/helm"
         type: string
@@ -44,6 +48,7 @@ on:
 jobs:
   connect-to-tailnet:
     if: ${{ inputs.connect_to_tailnet == 'true' }}
+    name: "Connect to Tailscale"
     permissions:
       id-token: write
       contents: read
@@ -66,6 +71,13 @@ jobs:
         authkey: ${{ env.TAILSCALE_AUTHKEY }}
         version: ${{ inputs.tailscale_client_version }}
 
+
+  trigger-jenkins-job:
+    if: ${{ inputs.connect_to_tailnet == 'true' }}
+    name: "Trigger Jenkins job."
+    permissions:
+      id-token: write
+      contents: read
     - uses: radixdlt/public-iac-resuable-artifacts/fetch-secrets@main
       with:
         role_name: 'arn:aws:iam::${{ secrets.secrets_account_id }}:role/gh-common-secrets-read-access'
@@ -78,7 +90,7 @@ jobs:
     - name: Trigger jenkins job to deploy PR
       uses: RDXWorks-actions/jenkins-job-trigger-action@master
       with:
-        jenkins_url: "${{ env.GH_JENKINS_URL }}/"
+        jenkins_url: "https://jenkins-internal.extratools.works/"
         jenkins_user: ${{ env.GH_JENKINS_USER }}
         jenkins_token: ${{ env.GH_JENKINS_API_TOKEN }}
         job_name: "kubernetes-deployments/job/radquest"
@@ -90,8 +102,8 @@ jobs:
             "hierarchical_namespace": "radquest-ci-pr",
             "namespace" : "radquest-pr-${{ github.event.number }}",
             "create_subnamespace" : "true",
-            "aws_region" : "eu-west-2",
-            "aws_iam_role": "arn:aws:iam::${{ secrets.secrets_account_id }}:role/jenkins-radquest-pr-deployer",
+            "aws_region" : "${{ inputs.aws_region }}",
+            "aws_iam_role": "arn:aws:iam::${{ secrets.secrets_account_id }}:role/${{ inputs.aws_iam_role_name }}",
             "aws_eks_cluster" : "${{ inputs.aws_eks_cluster }}",
             "helm_folder" : "${{ inputs.helm_dir }}",
             "helmfile_extra_vars" : "ci.tag=${{ inputs.image_tag }},ci.prNumber=${{ github.event.number }},ci.aws_account_number=${{ secrets.secrets_account_id }}"