Oppgrader bidrag-felles

.github/workflows/deploy_q1.yaml

@@ -3,6 +3,8 @@ on:
   workflow_dispatch:
   push:
     branches:
+      - '**'
+      - '!main'
       - 'q1/**'
       - 'Q1/**'
 env:
@@ -21,7 +23,7 @@ jobs:
 
   run_cucumber_tests-feature:
     runs-on: ubuntu-latest
-    name: Run cucumber tests feature
+    name: Run cucumber tests q1
     needs: build-deploy
     if: false #${{ always() && needs.build-deploy.outputs.deploy_suksess == 'true' }}
 

.github/workflows/pr.yaml

@@ -8,43 +8,24 @@ env:
 
 jobs:
   build-deploy:
-    name: "Build and deploy syntetisk"
+    name: "Build and deploy q2"
     permissions:
       contents: "read"
       id-token: "write"
     uses: navikt/bidrag-workflow/.github/workflows/deploy.yaml@main
     secrets: inherit
     with:
-      nais_variabler_filnavn: syntetisk.yaml
-
-  deploy_main:
-    runs-on: ubuntu-latest
-    name: Deploy main
-    permissions:
-      contents: "read"
-      id-token: "write"
-    if: github.actor != 'dependabot[bot]'
-    needs: build-deploy
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Deploy to dev-gcp
-        uses: nais/deploy/actions/deploy@v2
-        env:
-          CLUSTER: dev-gcp
-          RESOURCE: .nais/nais.yaml
-          VARS: .nais/main.yaml
-          IMAGE: ${{ needs.build-deploy.outputs.image }}
+      nais_variabler_filnavn: q2.yaml
 
   run_cucumber_tests-syntetisk:
     runs-on: ubuntu-latest
-    name: Run cucumber tests syntetisk
+    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
-      INGRESS_VEDTAK: https://bidrag-vedtak-syntetisk.intern.dev.nav.no
+      INGRESS_VEDTAK: https://bidrag-vedtak-q2.intern.dev.nav.no
 
     steps:
       - run: |