Docker jobs for OOF with dedicated node.

Used by optf-osdf and optf-has projects to build and push docker images.
Builds the docker images from script.
Uses dedicated docker build node.

Change-Id: I735034d022981d2bb89db8994d1c995efa428919
Issue-ID: OPTFRA-287
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 60e984e..ffca9ef 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -21,14 +21,39 @@
       - '{project-name}-{stream}-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'
+
+- project:
+    name: optf-has-docker
+    project-name: 'optf-has'
+    project: 'optf/has'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
+    mvn-settings: 'optf-has-settings'
+    subproject:
+      - 'conductor':
+          path: 'conductor'
+          pattern: 'conductor/**'
+          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-has-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-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-has-docker-image.sh'
+          build-node: queue-docker-4c-4g
 
 - project:
     name: optf-has-sonar

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 23d4144..cc4ce90 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -20,14 +20,39 @@
       - '{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'
+
+- project:
+    name: optf-osdf-docker
+    project-name: 'optf-osdf'
+    project: 'optf/osdf'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
+    mvn-settings: 'optf-osdf-settings'
+    subproject:
+      - 'osdf':
+          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-osdf-docker-image.sh'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-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-osdf-docker-image.sh'
+          build-node: queue-docker-4c-4g
 
 - project:
     name: optf-osdf-sonar