Refaktorisering av workflows

navikt · Aug 16, 2023 · 818ab77 · 818ab77
1 parent 57c9cb2
commit 818ab77
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 81 deletions.
diff --git a/.github/workflows/auto-deployment.yml b/.github/workflows/auto-deployment.yml
@@ -5,28 +5,6 @@ on:
         - cron: '0 08 * * 1' # kl 09 hver mandag
 
 jobs:
-    build-and-test:
-        name: Test frontend
-        uses: ./.github/workflows/test.yml
-
-    build-and-push:
-        name: Build and push Docker container for prod
-        uses: ./.github/workflows/build-push.yml
-        with:
-            environment: prod
-        secrets: inherit
-
-    deploy-prod:
-        name: Deploy to prod
-        needs: [build-and-test, build-and-push]
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - uses: nais/deploy/actions/deploy@v1
-              env:
-                  APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-                  DRY_RUN: false
-                  PRINT_PAYLOAD: true
-                  CLUSTER: prod-gcp
-                  RESOURCE: .nais/nais.yml
-                  VAR: app_version=${{ github.sha }},image=${{ needs.build-and-push.outputs.image }}
+    build-push-deploy-main:
+      uses: ./.github/workflows/main.yml
+      secrets: inherit
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,6 +6,7 @@ on:
     paths-ignore:
       - '**.md'
       - '**/**.md'
+  workflow_call:
 
 jobs:
     build-and-test:

diff --git a/.github/workflows/manual-deployment.yml b/.github/workflows/manual-deployment.yml
@@ -14,62 +14,17 @@ on:
                     - prod
 
 jobs:
-    build-and-test:
-      name: Test frontend
-      uses: ./.github/workflows/test.yml
-
-    build-and-push:
-        name: Build and push Docker container for ${{ inputs.environment }}
-        uses: ./.github/workflows/build-push.yml
-        with: 
-          environment: ${{ inputs.environment }}
+    preprod:
+        if: inputs.environment == 'preprod'
+        uses: ./.github/workflows/preprod.yml
         secrets: inherit
-
-    deploy-preprod:
-        name: Deploy to preprod
-        needs: [build-and-test, build-and-push]
-        if: github.event.inputs.environment == 'preprod'
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - uses: nais/deploy/actions/deploy@v1
-              env:
-                  APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-                  DRY_RUN: false
-                  PRINT_PAYLOAD: true
-                  CLUSTER: dev-gcp
-                  RESOURCE: .nais/nais-preprod.yml
-                  VAR: app_version=${{ github.sha }},image=${{ needs.build-and-push.outputs.image }}
 
-    deploy-preprod-alt:
-        name: Deploy to preprod-alt
-        needs: [build-and-test, build-and-push]
-        if: github.event.inputs.environment == 'preprod-alt'
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - uses: nais/deploy/actions/deploy@v1
-              env:
-                  APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-                  DRY_RUN: false
-                  PRINT_PAYLOAD: true
-                  CLUSTER: dev-gcp
-                  RESOURCE: .nais/nais-preprod-alt.yml
-                  VAR: app_version=${{ github.sha }},image=${{ needs.build-and-push.outputs.image }}
-
-    deploy-prod:
-        name: Deploy to prod
-        needs: [build-and-test, build-and-push]
-        if: github.event.inputs.environment == 'prod'
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - uses: nais/deploy/actions/deploy@v1
-              env:
-                  APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-                  DRY_RUN: false
-                  PRINT_PAYLOAD: true
-                  CLUSTER: prod-gcp
-                  RESOURCE: .nais/nais.yml
-                  VAR: app_version=${{ github.sha }},image=${{ needs.build-and-push.outputs.image }}
+    preprod-alt:
+        if: inputs.environment == 'preprod-alt'
+        uses: ./.github/workflows/preprod-alt.yml
+        secrets: inherit
 
+    prod:
+        if: inputs.environment == 'prod'
+        uses: ./.github/workflows/main.yml
+        secrets: inherit
diff --git a/.github/workflows/preprod-alt.yml b/.github/workflows/preprod-alt.yml
@@ -0,0 +1,29 @@
+name: Build, push, and deploy (preprod)
+on: workflow_call
+
+jobs:
+    build-and-test:
+      name: Test frontend
+      uses: ./.github/workflows/test.yml
+
+    build-and-push:
+      name: Build and push Docker container for preprod
+      uses: ./.github/workflows/build-push.yml
+      with: 
+        environment: preprod-alt
+      secrets: inherit
+
+    deploy-preprod:
+        name: Deploy to preprod-alt
+        needs: [build-and-test, build-and-push]
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: nais/deploy/actions/deploy@v1
+              env:
+                  APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+                  DRY_RUN: false
+                  PRINT_PAYLOAD: true
+                  CLUSTER: dev-gcp
+                  RESOURCE: .nais/nais-preprod-alt.yml
+                  VAR: app_version=${{ github.sha }},image=${{ needs.build-and-push.outputs.image }}
diff --git a/.github/workflows/preprod.yml b/.github/workflows/preprod.yml
@@ -6,6 +6,7 @@ on:
       paths-ignore:
         - '**.md'
         - '**/**.md'
+    workflow_call:
 
 jobs:
     build-and-test: