Update the cmso job to build docker

Issue-ID: OPTFRA-373
Change-Id: Ic947771203d8a5b80a115522ac15278b506fe47a
Signed-off-by: Jerry Flood <jflood@att.com>

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index e6ef1f9..cc1aac3 100644 (file)
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -1,29 +1,29 @@
 ---\r
+\r
 - project:\r
     name: optf-cmso\r
     project-name: 'optf-cmso'\r
-    project: 'optf/cmso'\r
-    stream:\r
-      - 'master':\r
-          branch: 'master'\r
-    mvn-settings: 'optf-cmso-settings'\r
-    subproject:\r
-      - 'cmso':\r
-          path: '.'\r
-          pattern: '**'\r
-          pom: 'pom.xml'\r
     jobs:\r
-      - gerrit-maven-clm\r
-      - '{project-name}-{stream}-{subproject}-verify-java'\r
-      - '{project-name}-{stream}-{subproject}-merge-java'\r
-      - '{project-name}-{stream}-{subproject}-release-version-java-daily'\r
-    files: '**'\r
-    archive-artifacts: ''\r
-    build-node: 'ubuntu1604-builder-4c-4g'\r
+      - gerrit-maven-clm:\r
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'\r
+      - '{project-name}-{stream}-verify-java-checkstyle':\r
+         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'\r
+      - '{project-name}-{stream}-merge-properties-java':\r
+         mvn_properties:\r
+            - docker.pull.registry=nexus3.onap.org:10001\r
+            - docker.push.registry=nexus3.onap.org:10003\r
+      - '{project-name}-{stream}-release-java-daily-checkstyle':\r
+         setVersion: 'DoSetVersion'\r
+         mvn_properties:\r
+          - docker.pull.registry=nexus3.onap.org:10001\r
+      - '{project-name}-{stream}-docker-java-properties-daily':\r
+         setVersion: 'DoSetVersion'\r
+         docker-pom: 'pom.xml'\r
+         mvn-profile: 'docker'\r
+         mvn-params: '-Dmaven.test.skip=true'\r
+         maven-properties: |\r
+          cmso.registry=$\r
 \r
-- project:\r
-    name: optf-cmso-docker\r
-    project-name: 'optf-cmso'\r
     project: 'optf/cmso'\r
     stream:\r
       - 'master':\r
@@ -34,21 +34,6 @@
           path: '.'\r
           pattern: '**'\r
           pom: 'pom.xml'\r
-    jobs:\r
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':\r
-          docker-pom: 'pom.xml'\r
-          mvn-goals: 'install'\r
-          mvn-params: '-Dmaven.test.skip=true'\r
-          script:\r
-            !include-raw-escape: 'build-optf-cmso-docker-image.sh'\r
-          build-node: queue-docker-4c-4g\r
-      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':\r
-          docker-pom: 'pom.xml'\r
-          mvn-goals: 'install'\r
-          mvn-params: '-Dmaven.test.skip=true'\r
-          script:\r
-            !include-raw-escape: 'build-optf-cmso-docker-image.sh'\r
-          build-node: queue-docker-4c-4g\r
 \r
 - project:\r
     name: optf-cmso-sonar\r