E!! rydder i github actions workflows

Author: Kjetil JD

.github/workflows/bygg_alle_brancher.yml .github/workflows/bygg_branch_og_publiser.yml

@@ -1,25 +1,21 @@
-name: Bygg alle brancher
+name: Bygg branch og publiser
 
 on:
   push:
     branches:
       - '*'
       - '*/*'
-      - '!release/*'
       - '!master'
 
 jobs:
-  bygg:
-    name: 'Bygg alle brancher'
+  bygg_og_publiser:
+    name: 'Bygg branch og publiser image'
     runs-on: ubuntu-latest
+    env:
+      package: eessi-pensjon-journalforing
     steps:
       - name: 'Pull repo'
-        uses: actions/checkout@v2
-
-      - name: 'Java 17'
-        uses: actions/[email protected]
-        with:
-          java-version: 17
+        uses: actions/checkout@v3
 
       - name: 'Setter dato og commit variabel'
         run: |
@@ -28,8 +24,13 @@ jobs:
           echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
       - name: 'Setter Image'
-        run: echo "IMAGE=ghcr.io/${{ github.repository }}/eessi-pensjon-journalforing:${{ env.DATE }}---${{ env.COMMIT_HASH }}" >> $GITHUB_ENV
+        run: echo "IMAGE=ghcr.io/${{ github.repository }}/${{ env.package }}:${{ env.DATE }}---${{ env.COMMIT_HASH }}" >> $GITHUB_ENV
 
+      - name: 'Java'
+        uses: actions/setup-java@v2
+        with:
+          java-version: 17
+          distribution: temurin
 
       - name: 'Bygg og publiser docker image'
         env:

.github/workflows/bygg_og_deploy_test.yml .github/workflows/bygg_mainline_og_deploy.yml

@@ -1,63 +1,61 @@
-name: Bygg og deploy Q2
+name: Bygg, deploy DEV, publiser, tag og dispatch deploy til PROD
 
 on:
   push:
     branches:
       - master
+
 jobs:
-  tag_build_and_deploy:
-    name: 'Build, deploy and tag'
+  bygg_deploy_dev_publiser_tag:
+    name: 'Bygg, publiser, deploy DEV, tag og dispatch deploy til PROD'
     runs-on: ubuntu-latest
+    env:
+      package: eessi-pensjon-journalforing
     steps:
-      # PULLER REPO
       - name: 'Pull repo'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      # SETTER DATO OG COMMIT VARIABEL
       - name: 'Setter dato og commit variabel'
         run: |
           export TZ=CET
           echo "DATE=$(date "+%Y-%m-%d--%H-%M-%S")" >> $GITHUB_ENV
           echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
-      # SETTER IMAGE VARIABEL
       - name: 'Setter Image'
-        run: echo "IMAGE=ghcr.io/${{ github.repository }}/eessi-pensjon-journalforing:${{ env.DATE }}---${{ env.COMMIT_HASH }}" >> $GITHUB_ENV
+        run: echo "IMAGE=ghcr.io/${{ github.repository }}/${{ env.package }}:${{ env.DATE }}---${{ env.COMMIT_HASH }}" >> $GITHUB_ENV
 
-      # JAVA 17
-      - name: 'Java 17'
-        uses: actions/[email protected]
+      - name: 'Java'
+        uses: actions/setup-java@v2
         with:
           java-version: 17
+          distribution: temurin
 
-      # BYGGER DOCKER CONTAINER
       - name: 'Bygg og publiser docker image'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          export TZ=CET
           ./gradlew build --stacktrace
           docker build --tag ${{ env.IMAGE }} .
           docker login ghcr.io -u ${GITHUB_REPOSITORY} -p ${{ secrets.GITHUB_TOKEN }}
           docker push ${{ env.IMAGE }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # DEPLOYER TIL NAIS Q2 team namespace
-      - name: 'Deploy to NAIS q2 gcp'
+      - name: 'Deploy to DEV'
         uses: nais/deploy/actions/deploy@v1
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: nais/dev-gcp.yml
           IMAGE: ${{ env.IMAGE }}
 
-      # OPPRETTER GIT TAG
       - name: 'Opprett git tag'
         run: |
-          curl -v -s -X POST https://api.github.com/repos/navikt/eessi-pensjon-journalforing/git/refs -H "Authorization: token  ${{ secrets.GITHUB_TOKEN }}" -d '{ "ref": "refs/tags/${{ env.DATE }}---${{ env.COMMIT_HASH }}",  "sha": "${{ env.COMMIT_HASH }}" }'
+          curl -v -s -X POST https://api.github.com/repos/${{ github.repository }}/git/refs -H "Authorization: token  ${{ secrets.GITHUB_TOKEN }}" -d '{ "ref": "refs/tags/${{ env.DATE }}---${{ env.COMMIT_HASH }}",  "sha": "${{ env.COMMIT_HASH }}" }'
 
-      - name: 'Repository Dispatch PROD'
+      - name: 'Dispatch PROD'
         uses: peter-evans/repository-dispatch@v1
         with:
           token: ${{ secrets.DISPATCH_TOKEN }}
           repository: ${{ github.repository }}
           event-type: deploy-prod
-          client-payload: '{"image": "${{ env.IMAGE }}"}'
+          client-payload: '{"image": "${{ env.IMAGE }}"}'

.github/workflows/deploy_prod.yml

@@ -2,16 +2,15 @@ name: Deploy PROD
 on:
   repository_dispatch:
     types: [deploy-prod]
+
 jobs:
-  tag_deploy_q1:
+  deploy_prod:
     name: 'Deploy til PROD'
     runs-on: ubuntu-latest
     steps:
-      # GET version
-      - name: 'Get the version'
-        uses: actions/checkout@v2
+      - name: 'Pull repo'
+        uses: actions/checkout@v3
 
-      # Show IMAGE from Q2 deploy
       - name: 'Vise image'
         run: |
           echo "image-tag: ${{ github.event.client_payload.image }}"

.github/workflows/deploy_topics.yml

@@ -11,9 +11,8 @@ jobs:
     name: 'Deploy topics'
     runs-on: ubuntu-latest
     steps:
-      # PULLER REPO
       - name: 'Pull repo'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: 'Deploy public-automatisering-q2 to eessipensjon namespace'
         uses: nais/deploy/actions/deploy@v1

.github/workflows/dispatch_issue_comment.yml

@@ -10,5 +10,4 @@ jobs:
         uses: peter-evans/slash-command-dispatch@v1
         with:
           token: ${{ secrets.DISPATCH_TOKEN }}
-          commands: prodsett
-          reactions: false
+          commands: prodsett

.github/workflows/prodsett_command.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Pull repo'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: 'Lager variable'
         run: |