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=6858e5d8f923fbbe69b5a81818647c02c78693ce;hb=refs%2Fchanges%2F47%2F6347%2F1;hp=c8759ff03a4516bb9cdddb9cf1434f288bd0d9b5;hpb=524c5ad82aa4d877402759d37fccdff37db44de0;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..6858e5d8 100644
--- a/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
+++ b/jjb/oam-nf-oam-adopter/oam-nf-adopter.yaml
@@ -19,7 +19,7 @@
    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'
@@ -36,17 +36,11 @@
 - 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-stage:
-          sign-artifacts: true
-          build-node: centos7-docker-2c-8g
-          maven-versions-plugin: true
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge:
       - 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':
@@ -70,13 +64,4 @@
     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
+    mvn-params: '-f ves-nf-oam-adopter/pom.xml -Ddocker.skip=true'
\ No newline at end of file