summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-02-22 19:45:44 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-22 19:45:44 +0000
commitcfd680290b349646d6df3fa4747130420f004677 (patch)
treeaa4817470f33aaaf2867f35b5348466a23d536b0
parentc3aa2a6c686e2c697bb53aa8178ab503a779a435 (diff)
parent376c8270b80d094b537ef63e0f5449f5259c2542 (diff)
Merge "Added docker release jobs for has and osdf"
-rw-r--r--jjb/optf/build-optf-has-docker-image.sh10
-rw-r--r--jjb/optf/build-optf-osdf-docker-image.sh10
-rw-r--r--jjb/optf/optf-has.yaml5
-rw-r--r--jjb/optf/optf-osdf.yaml5
4 files changed, 30 insertions, 0 deletions
diff --git a/jjb/optf/build-optf-has-docker-image.sh b/jjb/optf/build-optf-has-docker-image.sh
new file mode 100644
index 000000000..d1405f4d2
--- /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
index 000000000..99eab5db6
--- /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 c1fa71d4b..95eba8ff1 100644
--- 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 617e68131..d58611ca5 100644
--- 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'