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=e751e7fd38be7266e74ed06abc2b26e5898c1f37;hb=3ced11a2aea8b7cf99e93d25d512aaa0851d0404;hp=c8759ff03a4516bb9cdddb9cf1434f288bd0d9b5;hpb=c5326db34807aac9542c0b00eaf9ba43a36e3aeb;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 c8759ff0..e751e7fd 100644
--- a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@ -5,57 +5,48 @@
     views:
       - project-view
 
-- project:
-    name: oam-nf-oam-adopter-info
+- _oam-nf-oam-adopter: &oam-nf-oam-adopter
+    name: oam-nf-oam-adopter
     project: oam/nf-oam-adopter
     project-name: oam-nf-oam-adopter
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- oam-nf-oam-adopter: &oam-nf-oam-adopter
-   name: oam-nf-oam-adopter
-   project: oam/nf-oam-adopter
-   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-version: "mvn36"
-   maven-version: "mvn36"
-   mvn-settings: 'oam-nf-oam-adopter-settings'
-   build-node: centos7-docker-2c-8g
+    java-version: openjdk11
+    mvn-pom: "ves-nf-oam-adopter/pom.xml"
+    mvn-params: "-f ves-nf-oam-adopter/pom.xml -P docker -Dbuild.number=${{BUILD_NUMBER}}"
+    mvn-version: "mvn36"
+    mvn-settings: "oam-nf-oam-adopter-settings"
+    build-node: centos7-docker-2c-8g
 
 - project:
     <<: *oam-nf-oam-adopter
     name: oam-nf-oam-adopter-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'oran-'
-    branch: 'master'
+    nexus-iq-namespace: "oran-"
+    branch: "master"
 
 - project:
     <<: *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':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-8g
     stream:
-      - 'master':
-          branch: 'master'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+    files: "**"
+    archive-artifacts: ""
 
 - project:
     <<: *oam-nf-oam-adopter
@@ -63,20 +54,12 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    cron: '@daily'
-    branch: 'master'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-params: '-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true'
-
-- project:
-    <<: *oam-nf-oam-adopter
-    name: oam-nf-oam-adopter-whitesource
-    jobs:
-      - gerrit-whitesource-scan
-    wss-product-name: nf-oam-adopter
-    mvn-clean-install: true
-    branch: master
+    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"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    mvn-params: "-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true"