Update SonarQube properties and image format in build.gradle and conf…

…ig.yml files
navikt · Jan 4, 2024 · 887ebe4 · 887ebe4
1 parent f4e0154
commit 887ebe4
Show file tree

Hide file tree

Showing 179 changed files with 277 additions and 277 deletions.
diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
@@ -19,12 +19,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "navit_testnorge_adresse_service"

diff --git a/apps/adresse-service/config.yml b/apps/adresse-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   webproxy: true
   tokenx:
     enabled: true

diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "navit_testnorge_amelding_service"

diff --git a/apps/amelding-service/config.yml b/apps/amelding-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   port: 8080
   accessPolicy:
     inbound:

diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "navit_testnorge_app_tilgang_analyse_service"

diff --git a/apps/app-tilgang-analyse-service/config.yml b/apps/app-tilgang-analyse-service/config.yml
@@ -13,7 +13,7 @@ spec:
       allowAllUsers: true
       enabled: true
       tenant: nav.no
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   accessPolicy:
     inbound:

diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-arbeidsforhold-service"

diff --git a/apps/arbeidsforhold-service/config.yml b/apps/arbeidsforhold-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   port: 8080
   tokenx:
     enabled: true

diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-batch-bestilling-service"

diff --git a/apps/batch-bestilling-service/config.yml b/apps/batch-bestilling-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   webproxy: true
   tokenx:

diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -19,12 +19,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "brreg-stub"

diff --git a/apps/brreg-stub/config.yml b/apps/brreg-stub/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   liveness:
     path: /isAlive

diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -27,12 +27,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-bruker-service"

diff --git a/apps/bruker-service/config.test.yml b/apps/bruker-service/config.test.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   tokenx:
     enabled: true

diff --git a/apps/bruker-service/config.yml b/apps/bruker-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   port: 8080
   tokenx:
     enabled: true

diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle
@@ -90,7 +90,7 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"

diff --git a/apps/budpro-service/config.yml b/apps/budpro-service/config.yml
@@ -19,7 +19,7 @@ spec:
       allowAllUsers: true
       enabled: true
       tenant: nav.no
-  image: {{image}}
+  image: "{{image}}"
   ingresses:
     - "https://testnav-budpro-service.intern.dev.nav.no"
   liveness:

diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "dolly-frontend"

diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle
@@ -12,12 +12,12 @@ test {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-dollystatus"

diff --git a/apps/dollystatus/config.yml b/apps/dollystatus/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   accessPolicy:
     outbound:

diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-endringsmelding-frontend"

diff --git a/apps/endringsmelding-frontend/config.yml b/apps/endringsmelding-frontend/config.yml
@@ -41,6 +41,6 @@ spec:
     requests:
       cpu: 300m
       memory: 1024Mi
-  image: {{ image }}
+  image: "{{image}}"
   ingresses:
     - "https://testnav-endringsmelding.intern.dev.nav.no"
diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle
@@ -12,12 +12,12 @@ test {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-endringsmelding-service"

diff --git a/apps/endringsmelding-service/config.yml b/apps/endringsmelding-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   webproxy: true
   tokenx:

diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-ereg-batch-status-service"

diff --git a/apps/ereg-batch-status-service/config.yml b/apps/ereg-batch-status-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   port: 8080
   webproxy: true
   accessPolicy:

diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-faste-data-frontend"

diff --git a/apps/faste-data-frontend/config.yml b/apps/faste-data-frontend/config.yml
@@ -44,6 +44,6 @@ spec:
     requests:
       cpu: 300m
       memory: 1024Mi
-  image: {{ image }}
+  image: "{{image}}"
   ingresses:
     - "https://testnav-faste-data.intern.dev.nav.no"
diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-generer-arbeidsforhold-populasjon-service"

diff --git a/apps/generer-arbeidsforhold-populasjon-service/config.yml b/apps/generer-arbeidsforhold-populasjon-service/config.yml
@@ -8,7 +8,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{ image }}
+  image: "{{image}}"
   port: 8080
   tokenx:
     enabled: true

diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-generer-navn-service"

diff --git a/apps/generer-navn-service/config.yml b/apps/generer-navn-service/config.yml
@@ -6,7 +6,7 @@ metadata:
   labels:
     team: dolly
 spec:
-  image: {{image}}
+  image: "{{image}}"
   port: 8080
   tracing:
     enabled: true

diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle
@@ -18,12 +18,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-generer-organisasjon-populasjon-service"