fixup! cb38522

canonical · Jan 15, 2025 · 4c9b0f5 · 4c9b0f5
1 parent cb8cfc1
commit 4c9b0f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/_deploy.yaml b/.github/workflows/_deploy.yaml
@@ -15,6 +15,8 @@ on:
             required: true
         CLIENT_SECRET:
             required: true
+        JIMM_URL:
+          required: true    
 
 jobs:
   deploy:
@@ -31,7 +33,7 @@ jobs:
           echo "TF_VAR_client_id=${{ secrets.CLIENT_ID }}" >> $GITHUB_ENV
           echo "TF_VAR_client_secret=${{ secrets.CLIENT_SECRET }}" >> $GITHUB_ENV
           echo "TF_VAR_cloud=k8s-${{ inputs.model }}" >> $GITHUB_ENV
-          echo "TF_VAR_jimm_url=cd-jimm.stg.canonical.com:443" >> $GITHUB_ENV
+          echo "TF_VAR_jimm_url=${{ secrets.JIMM_URL }}" >> $GITHUB_ENV
       - name: Import application into state
         working-directory: ./deployment
         run: |

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -30,6 +30,7 @@ jobs:
     secrets:
       CLIENT_ID: ${{ secrets.JIMM_STG_CLIENT_ID }}
       CLIENT_SECRET: ${{ secrets.JIMM_STG_CLIENT_SECRET }}
+      JIMM_URL: ${{ secrets.JIMM_URL }}
   dev-deploy:
     if: ${{ (inputs.model == 'dev') }}
     uses: ./.github/workflows/_deploy.yaml
@@ -40,6 +41,7 @@ jobs:
     secrets:
       CLIENT_ID: ${{ secrets.JIMM_DEV_CLIENT_ID }}
       CLIENT_SECRET: ${{ secrets.JIMM_DEV_CLIENT_SECRET }}
+      JIMM_URL: ${{ secrets.JIMM_URL }}
   stg-deploy:
     if: ${{ (inputs.model == 'stg') }}
     uses: ./.github/workflows/_deploy.yaml
@@ -50,3 +52,4 @@ jobs:
     secrets:
       CLIENT_ID: ${{ secrets.JIMM_STG_CLIENT_ID }}
       CLIENT_SECRET: ${{ secrets.JIMM_STG_CLIENT_SECRET }}
+      JIMM_URL: ${{ secrets.JIMM_URL }}