From de55942e324aed68c3639bbba4d67ff9ca0b64e9 Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Wed, 17 Oct 2018 17:01:18 -0400
Subject: Update the cmso job to build docker

Issue-ID: OPTFRA-373
Change-Id: Ic947771203d8a5b80a115522ac15278b506fe47a
Signed-off-by: Jerry Flood <jflood@att.com>
---
 jjb/optf/optf-cmso.yaml | 55 ++++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

(limited to 'jjb/optf/optf-cmso.yaml')

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