X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foam-nf-oam-adopter%2Foam-nf-adopter.yaml;h=e615443614eb265f99651e0d47c771d4bca7d1ac;hb=5c8660637f7d0e180d4708c9b8d4b5693b0627fa;hp=84623548be4495d74b11994dbfabd0b50bc6aa7f;hpb=95d47304c32de94cde99461c7cbab6ab280ae25c;p=ci-management.git

diff --git a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
index 84623548..e6154436 100644
--- a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@ -19,9 +19,8 @@
    project-name: oam-nf-oam-adopter
    java-version: openjdk11
    mvn-pom: 'ves-nf-oam-adopter/pom.xml'
-   mvn-params: '-f ves-nf-oam-adopter/pom.xml'
+   mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker -Dbuild.number=${{BUILD_NUMBER}}'
    mvn-version: "mvn36"
-   maven-version: "mvn36"
    mvn-settings: 'oam-nf-oam-adopter-settings'
    build-node: centos7-docker-2c-8g
 
@@ -37,16 +36,16 @@
     <<: *oam-nf-oam-adopter
     jobs:
       - gerrit-maven-verify
-      - gerrit-maven-merge:
-          mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker'
+      - gerrit-maven-merge
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge:
       - gerrit-maven-stage:
-          sign-artifacts: true
           build-node: centos7-docker-2c-8g
+          sign-artifacts: true
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-2c-8g
           maven-versions-plugin: true
-          mvn-params: '-f ves-nf-oam-adopter/pom.xml -P docker'
           container-public-registry: nexus3.o-ran-sc.org:10001
           container-staging-registry: nexus3.o-ran-sc.org:10004
       - '{project-name}-gerrit-release-jobs':
@@ -66,6 +65,7 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar.build.sourceEncoding: 'UTF-8'
     cron: '@daily'
     branch: 'master'
     mvn-goals: 'clean install'