pågående initiell utvikling

navikt · Jan 14, 2025 · ab5db14 · ab5db14
1 parent 054cfe2
commit ab5db14
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/deploy_dev_gcp.yml b/.github/workflows/deploy_dev_gcp.yml
@@ -28,11 +28,11 @@ jobs:
           echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
       # SETTER IMAGE VARIABEL
       - name: 'Setting Image Variabel'
-        run: echo "IMAGE=docker.pkg.github.com/${{ github.repository }}/omsorgsopptjening-start-innlesning:${{ env.DATE }}---${{ env.COMMIT_HASH }}" >> $GITHUB_ENV
+        run: echo "IMAGE=docker.pkg.github.com/${{ github.repository }}/pensjon-opptjening-filadapter:${{ env.DATE }}---${{ env.COMMIT_HASH }}" >> $GITHUB_ENV
 
       # SETTER IMAGE GHCR VARIABEL
       - name: 'Setting Image ghcr Variabel'
-        run: echo "IMAGE_GHCR=ghcr.io/${{ github.repository }}/omsorgsopptjening-start-innlesning:${{ env.DATE }}---${{ env.COMMIT_HASH }}" >> $GITHUB_ENV
+        run: echo "IMAGE_GHCR=ghcr.io/${{ github.repository }}/pensjon-opptjening-filadapter:${{ env.DATE }}---${{ env.COMMIT_HASH }}" >> $GITHUB_ENV
 
       # JAVA 21
       - name: 'Java 21'

diff --git a/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/config/DatasourceConfig.kt b/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/config/DatasourceConfig.kt
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Profile
 
 @Configuration
-@Profile("dev-gcp", "prod-gcp", "kafkaIntegrationTest")
+@Profile("dev-gcp", "prod-gcp")
 class DatasourceConfig {
 
     @Bean
@@ -36,4 +36,4 @@ class DatasourceConfig {
     ): DatasourceReadinessCheck {
         return DatasourceReadinessCheck(datasource)
     }
-}
+}
diff --git a/src/test/kotlin/no/nav/pensjon/opptjening/filadapter/common/PostgresqlTestContainer.kt b/src/test/kotlin/no/nav/pensjon/opptjening/filadapter/common/PostgresqlTestContainer.kt
@@ -28,16 +28,18 @@ class PostgresqlTestContainer private constructor(image: String) : PostgreSQLCon
 
 
     companion object {
-        val instance: PostgresqlTestContainer = PostgresqlTestContainer("postgres:16.4-alpine")
+//        val instance: PostgresqlTestContainer = PostgresqlTestContainer("postgres:16.4-alpine")
+        val instance: PostgresqlTestContainer = PostgresqlTestContainer("postgres:17.2-bookworm")
         private val dataSource = HikariDataSource(HikariConfig().apply {
-            jdbcUrl = "jdbc:tc:postgresql:16:///test"
+            jdbcUrl = "jdbc:tc:postgresql:17:///test"
             username = instance.username
             password = instance.password
         })
         fun createInstance(name: String): DataSource {
-            val instance = PostgresqlTestContainer("postgres:16.4-alpine")
+//            val instance = PostgresqlTestContainer("postgres:16.4-alpine")
+            val instance = PostgresqlTestContainer("postgres:17.2-bookworm")
             val dataSource = HikariDataSource(HikariConfig().apply {
-                jdbcUrl = "jdbc:tc:postgresql:16:///$name"
+                jdbcUrl = "jdbc:tc:postgresql:17:///$name"
                 username = instance.username
                 password = instance.password
             })

diff --git a/src/test/kotlin/no/nav/pensjon/opptjening/filadapter/config/DatasourceConfig.kt b/src/test/kotlin/no/nav/pensjon/opptjening/filadapter/config/DatasourceConfig.kt
@@ -13,7 +13,7 @@ class DatasourceConfig {
     ): HikariDataSource {
         return HikariDataSource(
             HikariConfig().apply {
-                jdbcUrl = "jdbc:tc:postgresql:16:///test"
+                jdbcUrl = "jdbc:tc:postgresql:17:///test"
                 username = "test"
                 password = "test"
                 driverClassName = "org.testcontainers.jdbc.ContainerDatabaseDriver"