Merge "Added docker release jobs for has and osdf"

diff --git a/jjb/optf/build-optf-has-docker-image.sh b/jjb/optf/build-optf-has-docker-image.sh
new file mode 100644 (file)
index 0000000..d1405f4
--- /dev/null
+++ b/jjb/optf/build-optf-has-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./conductor/docker/*.*
+
+./conductor/docker/build-dockers.sh

diff --git a/jjb/optf/build-optf-osdf-docker-image.sh b/jjb/optf/build-optf-osdf-docker-image.sh
new file mode 100644 (file)
index 0000000..99eab5d
--- /dev/null
+++ b/jjb/optf/build-optf-osdf-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./docker/*.*
+
+./docker/build_image.sh

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index c1fa71d..95eba8f 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -18,6 +18,11 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-optf-has-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 617e681..d58611c 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -18,6 +18,11 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-optf-osdf-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-basebuild-4c-4g'