Refactor deploy workflow

.github/workflows/contentauthor.yaml

@@ -229,33 +229,20 @@ jobs:
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   deploy-eb:
-    name: Deploy CA to test environments
+    name: Deploy CA
     if: always() && needs.build_test_publish.result == 'success' && github.event_name == 'push' && github.ref == 'refs/heads/master'
     needs: [build_test_publish]
+    environment: ${{ matrix.environment }}
     strategy:
       matrix:
         environment:
           - test
           - ndla_staging
-    environment: ${{ matrix.environment }}
-    concurrency: deploy-ca-${{ matrix.environment }}
-    runs-on: ubuntu-22.04
-    permissions:
-      id-token: write
-      contents: read
-
-    steps:
-     - name: Checkout
-       uses: actions/checkout@v4
-
-     - name: Configure AWS Credentials
-       uses: aws-actions/configure-aws-credentials@v4
-       with:
-        role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-        aws-region: eu-west-1
-        role-duration-seconds: 3600
-        role-session-name: GithubCerpusDevDeploy
-
-     - name: Re-deploy docker-compose on Elastic Beanstalk
-       run: |
-        aws elasticbeanstalk update-environment --environment-name ${{ vars.CA_ENVIRONMENT_NAME }} --version-label ${{ vars.CA_APPLICATION_VERSION }}
+    uses: ./.github/workflows/deploy.yaml
+    with:
+      name: Content Author
+      environment: ${{ matrix.environment }}
+      environment_name: ${{ vars.CA_ENVIRONMENT_NAME }}
+      version: ${{ vars.CA_APPLICATION_VERSION }}
+    secrets:
+      aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}

.github/workflows/deploy.yaml

@@ -0,0 +1,39 @@
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+      environment_name:
+        required: true
+        type: string
+      name:
+        required: true
+        type: string
+      version:
+        required: true
+        type: string
+    secrets:
+      aws_role_to_assume:
+        required: true
+
+jobs:
+  deploy:
+    name: Deploy ${{ inputs.name }} to ${{ inputs.environment }}
+    concurrency: deploy-${{ inputs.name }}-${{ inputs.environment }}
+    runs-on: ubuntu-24.04
+
+    steps:
+     - name: Configure AWS Credentials
+       uses: aws-actions/configure-aws-credentials@v4
+       with:
+        aws-region: eu-west-1
+        role-to-assume: ${{ secrets.aws_role_to_assume }}
+        role-duration-seconds: 3600
+        role-session-name: GithubCerpusDevDeploy
+
+     - name: Re-deploy docker-compose on Elastic Beanstalk
+       run: |
+         aws elasticbeanstalk update-environment \
+          --environment-name ${{ inputs.environment_name }} \
+          --version-label ${{ inputs.version }} 

.github/workflows/hub.yaml

@@ -250,33 +250,21 @@ jobs:
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   deploy-eb:
-    name: Deploy hub to test environments
+    name: Deploy hub
     if: always() && needs.build_test_publish.result == 'success' && github.event_name == 'push' && github.ref == 'refs/heads/master'
     needs: [build_test_publish]
+    environment: ${{ matrix.environment }}
     strategy:
       matrix:
         environment:
           - test
           - ndla_staging
-    environment: ${{ matrix.environment }}
-    concurrency: deploy-hub-${{ matrix.environment }}
-    runs-on: ubuntu-22.04
-    permissions:
-      id-token: write
-      contents: read
+    use: ./.github/workflows/deploy.yaml
+    with:
+      name: Hub
+      environment: ${{ matrix.environment }}
+      environment_name: ${{ vars.HUB_ENVIRONMENT_NAME }}
+      version: ${{ vars.HUB_APPLICATION_VERSION }}
+    secrets:
+      aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
 
-    steps:
-     - name: Checkout
-       uses: actions/checkout@v4
-
-     - name: Configure AWS Credentials
-       uses: aws-actions/configure-aws-credentials@v4
-       with:
-        role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-        aws-region: eu-west-1
-        role-duration-seconds: 3600
-        role-session-name: GithubCerpusDevDeploy
-
-     - name: Re-deploy docker-compose on Elastic Beanstalk
-       run: |
-        aws elasticbeanstalk update-environment --environment-name ${{ vars.HUB_ENVIRONMENT_NAME }} --version-label ${{ vars.HUB_APPLICATION_VERSION }}