Skip to content

Commit 818ca0c

Browse files
authored
Tar i bruk reusable workflow (#952)
1 parent b9552c0 commit 818ca0c

File tree

6 files changed

+78
-234
lines changed

6 files changed

+78
-234
lines changed

.github/workflows/build.yaml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: "Bygg og deploy"
2+
on:
3+
push:
4+
branches:
5+
- '**'
6+
paths-ignore:
7+
- '**.md'
8+
- '**.MD'
9+
- '.gitignore'
10+
- 'LICENSE'
11+
- 'CODEOWNERS'
12+
- '.github/*.yml'
13+
14+
15+
jobs:
16+
build-app:
17+
name: Build
18+
permissions:
19+
contents: read
20+
packages: write
21+
id-token: write
22+
uses: navikt/sif-gha-workflows/.github/workflows/maven-build-app-db.yml@main
23+
with:
24+
java-version: 21
25+
build-image: ${{ github.ref_name == 'master' }}
26+
push-image: ${{ github.ref_name == 'master' }}
27+
db_schema: pleiepengerbarnuttak_unit
28+
pg_version: 12
29+
secrets: inherit
30+
31+
verdikjede-tester:
32+
name: Verdikjedetester
33+
secrets: inherit
34+
permissions:
35+
id-token: write
36+
contents: write
37+
issues: write
38+
packages: read
39+
uses: navikt/sif-gha-workflows/.github/workflows/verdikjede-test.yml@main
40+
if: github.ref_name == 'master'
41+
needs: build-app
42+
with:
43+
tag: ${{ needs.build-app.outputs.build-version }}
44+
45+
46+
deploy-dev:
47+
name: Deploy dev
48+
permissions:
49+
id-token: write
50+
contents: read
51+
if: github.ref_name == 'master'
52+
needs: [build-app, verdikjede-tester]
53+
uses: navikt/sif-gha-workflows/.github/workflows/maven-deploy.yml@main
54+
with:
55+
gar: true
56+
image: ${{ needs.build-app.outputs.build-version }}
57+
cluster: dev-fss
58+
naiserator_file: nais/dev-fss-k9saksbehandling.yml
59+
secrets: inherit
60+
61+
deploy-prod:
62+
name: Deploy prod
63+
permissions:
64+
id-token: write
65+
contents: read
66+
if: github.ref_name == 'master'
67+
needs: [build-app, verdikjede-tester, deploy-dev]
68+
uses: navikt/sif-gha-workflows/.github/workflows/maven-deploy.yml@main
69+
with:
70+
gar: true
71+
image: ${{ needs.build-app.outputs.build-version }}
72+
cluster: prod-fss
73+
naiserator_file: nais/prod-fss-k9saksbehandling.yml
74+
secrets: inherit

.github/workflows/dispatch.yml

-15
This file was deleted.

.github/workflows/master.yml

-103
This file was deleted.

.github/workflows/promote.yaml

-78
This file was deleted.

.github/workflows/pull-requests.yml

-34
This file was deleted.

server/src/test/kotlin/no/nav/pleiepengerbarn/uttak/server/DbTestConfig.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ class DbTestConfig {
4242
companion object {
4343
// Lazy because we only want it to be initialized when accessed
4444
private val postgres: KPostgreSQLContainer by lazy {
45-
KPostgreSQLContainer("postgres:11.1")
45+
KPostgreSQLContainer("postgres:12.1")
4646
.withDatabaseName("databasename")
47-
.withUsername("postgres")
48-
.withPassword("test")
47+
.withUsername("pleiepengerbarn_unit")
48+
.withPassword("pleiepengerbarn_unit")
4949
}
5050
}
5151
}
5252

5353
// Hack needed because testcontainers use of generics confuses Kotlin
54-
class KPostgreSQLContainer(imageName: String) : PostgreSQLContainer<KPostgreSQLContainer>(imageName)
54+
class KPostgreSQLContainer(imageName: String) : PostgreSQLContainer<KPostgreSQLContainer>(imageName)

0 commit comments

Comments
 (0)