Skip to content

Commit 5ba3422

Browse files
authored
GA: Tar i bruk ny rutine for deploy, codeql og autotest
1 parent bbc6c5f commit 5ba3422

File tree

7 files changed

+93
-94
lines changed

7 files changed

+93
-94
lines changed

.github/dependabot.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version: 2
22
registries:
3-
fp-felles: # Gir tilgang til registre innad i nav med fp-felles som inngang (PATen bestemmer)
3+
maven-github:
44
type: maven-repository
55
url: https://maven.pkg.github.com/navikt/fp-felles
66
username: x-access-token
7-
password: ${{ secrets.PAT }}
7+
password: ${{ secrets.READER_TOKEN }}
88

99
updates:
1010
- package-ecosystem: github-actions
@@ -15,7 +15,7 @@ updates:
1515
- package-ecosystem: maven
1616
directory: "/"
1717
registries:
18-
- fp-felles
18+
- maven-github
1919
schedule:
2020
interval: daily
2121
open-pull-requests-limit: 20

.github/workflows/build.yml

+47-33
Original file line numberDiff line numberDiff line change
@@ -30,61 +30,75 @@ jobs:
3030
build-image: ${{ github.ref_name == 'master' }} # default: true
3131
push-image: ${{ github.ref_name == 'master' }} # default: false
3232
secrets: inherit
33+
34+
release-drafter:
35+
name: Update
36+
if: github.ref_name == 'master'
37+
needs: build-app
38+
uses: navikt/fp-gha-workflows/.github/workflows/release-drafter.yml@main
39+
secrets: inherit
3340

34-
create-issue:
35-
name: Issues
41+
trigger-autotest-k9:
42+
name: Autotest K9
3643
if: github.ref_name == 'master'
3744
needs: build-app
38-
uses: navikt/fp-gha-workflows/.github/workflows/issues.yml@main
45+
uses: navikt/fp-gha-workflows/.github/workflows/autotest.yml@main
3946
with:
4047
build-version: ${{ needs.build-app.outputs.build-version }}
48+
test-repo: 'k9-verdikjede' # default: fpsak-autotest
49+
test-workflow: 'build.yml' # default: trigger.yml
4150
secrets: inherit
4251

43-
promote-dev:
44-
name: Deploy
52+
fpsak-tester:
53+
name: Fpsak tester
4554
if: github.ref_name == 'master'
46-
needs: [ build-app, create-issue ]
47-
uses: navikt/fp-gha-workflows/.github/workflows/deploy-app.yml@main
55+
needs: build-app
56+
uses: navikt/fp-autotest/.github/workflows/autotest.yml@master
4857
with:
49-
issue-number: ${{ needs.create-issue.outputs.issue-number }}
50-
environment: dev
51-
platform: fss
58+
build-version: ${{ needs.build-app.outputs.build-version }}
59+
test-suite: fpsak
5260
secrets: inherit
53-
54-
trigger-autotest-fp:
55-
name: Autotest FP
61+
62+
verdikjede-tester:
63+
name: Verdikjedetester
5664
if: github.ref_name == 'master'
57-
needs: [ build-app, create-issue ]
58-
uses: navikt/fp-gha-workflows/.github/workflows/autotest.yml@main
65+
needs: build-app
66+
uses: navikt/fp-autotest/.github/workflows/autotest.yml@master
5967
with:
6068
build-version: ${{ needs.build-app.outputs.build-version }}
61-
issue-number: ${{ needs.create-issue.outputs.issue-number }}
69+
test-suite: verdikjede
6270
secrets: inherit
6371

64-
trigger-autotest-k9:
65-
name: Autotest K9
66-
if: github.ref_name == 'master'
67-
needs: [ build-app, create-issue ]
68-
uses: navikt/fp-gha-workflows/.github/workflows/autotest.yml@main
72+
notify:
73+
name: Notify
74+
if: github.ref_name == 'master' && (success() || failure())
75+
needs: [build-app, fpsak-tester, verdikjede-tester]
76+
uses: navikt/fp-autotest/.github/workflows/report-and-notify.yml@autotester
6977
with:
78+
fpsak: ${{ needs.fpsak-tester.outputs.resultat }}
79+
verdikjede: ${{ needs.verdikjede-tester.outputs.resultat }}
7080
build-version: ${{ needs.build-app.outputs.build-version }}
71-
issue-number: ${{ needs.create-issue.outputs.issue-number }}
72-
test-repo: 'k9-verdikjede' # default: fpsak-autotest
73-
test-workflow: 'build.yml' # default: trigger.yml
7481
secrets: inherit
7582

76-
release-drafter:
77-
name: Update
83+
deploy-dev:
84+
name: Deploy dev
7885
if: github.ref_name == 'master'
79-
needs: build-app
80-
uses: navikt/fp-gha-workflows/.github/workflows/release-drafter.yml@main
86+
needs: [build-app, fpsak-tester, verdikjede-tester]
87+
uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
88+
with:
89+
image: ghcr.io/${{ github.repository }}:${{ needs.build-app.outputs.build-version }}
90+
cluster: dev-fss
8191
secrets: inherit
8292

83-
snyk:
84-
name: Snyk
85-
needs: build-app
86-
uses: navikt/fp-gha-workflows/.github/workflows/snyk.yml@main
93+
deploy-prod:
94+
name: Deploy prod
95+
if: github.ref_name == 'master'
96+
needs: [build-app, fpsak-tester, verdikjede-tester, deploy-dev]
97+
uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
8798
with:
88-
build-version: ${{ needs.build-app.outputs.build-version }}
99+
image: ghcr.io/${{ github.repository }}:${{ needs.build-app.outputs.build-version }}
100+
cluster: prod-fss
89101
secrets: inherit
90102

103+
104+

.github/workflows/codeql.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
schedule:
9+
- cron: '0 0 * * 0,4'
10+
11+
jobs:
12+
codeql:
13+
name: CodeQl
14+
permissions:
15+
actions: read
16+
contents: read
17+
security-events: write
18+
uses: navikt/fp-gha-workflows/.github/workflows/codeql.yml@main
19+
secrets: inherit

.github/workflows/deploy-manuelt.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Deploy manuelt
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
image:
6+
required: true
7+
type: string
8+
description: 'Image tag to deploy (example 2023.03.10.080433-f821119)'
9+
environment:
10+
required: true
11+
type: choice
12+
description: 'The environment to deployed to (dev|prod)'
13+
options:
14+
- dev
15+
- prod
16+
17+
jobs:
18+
deploy:
19+
name: Deploy dev
20+
uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
21+
with:
22+
image: ghcr.io/${{ github.repository }}:${{ inputs.image }}
23+
cluster: ${{ inputs.environment }}-fss
24+
secrets: inherit

.github/workflows/dispatch.yml

-11
This file was deleted.

.github/workflows/promote.yml

-29
This file was deleted.

.github/workflows/snyk.yml

-18
This file was deleted.

0 commit comments

Comments
 (0)