Oppdater github workflow (#265)

* Oppdater github workflow * Oppdater github workflow
navikt · Oct 31, 2023 · 56bc8e0 · 56bc8e0
1 parent cb4a328
commit 56bc8e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/deploy_feature.yaml b/.github/workflows/deploy_feature.yaml
@@ -10,17 +10,18 @@ env:
 
 jobs:
   build-deploy:
-    name: "Build and deploy to feature"
+    name: "Build and deploy"
     permissions:
       contents: "read"
       id-token: "write"
-    uses: navikt/bidrag-workflow/.github/workflows/deploy_feature.yaml@main
+    uses: navikt/bidrag-workflow/.github/workflows/deploy.yaml@main
     secrets: inherit
 
   run_cucumber_tests:
     runs-on: ubuntu-latest
     name: Run cucumber tests
     needs: build-deploy
+    if: ${{ always() && needs.build-deploy.outputs.deploy_suksess == 'true' }}
 
     env:
       INGRESS_CUCUMBER: https://bidrag-cucumber-cloud-feature.ekstern.dev.nav.no

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -8,17 +8,20 @@ env:
 
 jobs:
   build-deploy:
-    name: "Build and deploy to main"
+    name: "Build and deploy"
     permissions:
       contents: "read"
       id-token: "write"
-    uses: navikt/bidrag-workflow/.github/workflows/deploy_main.yaml@main
+    uses: navikt/bidrag-workflow/.github/workflows/deploy.yaml@main
     secrets: inherit
+    with:
+      nais_variabler_filnavn: main.yaml
 
   run_cucumber_tests:
     runs-on: ubuntu-latest
     name: Run cucumber tests
     needs: build-deploy
+    if: ${{ always() && needs.build-deploy.outputs.deploy_suksess == 'true' }}
 
     env:
       INGRESS_CUCUMBER: https://bidrag-cucumber-cloud.ekstern.dev.nav.no

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,5 +12,5 @@ jobs:
     permissions:
       contents: "write"
       id-token: "write"
-    uses: navikt/bidrag-workflow/.github/workflows/release.yaml@main
+    uses: navikt/bidrag-workflow/.github/workflows/deploy_prod.yaml@main
     secrets: inherit