summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2017-10-12 16:26:24 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-12 16:26:24 +0000
commitcbce7135dab87959f35801af84a54bd731f306e8 (patch)
tree6477c02ba75b0cf4ed07867b1786aa4cc13f1ff7 /jjb
parent3e84fe6c1d45303bb068f3d118700d69a60057b8 (diff)
parentc06e1c8e810527d18b275cdae6a42d251febb3de (diff)
Merge "Jenkins Jobs for vmware vesagent"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh3
-rw-r--r--jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh10
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml3
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml25
4 files changed, 35 insertions, 6 deletions
diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh
index 0a8f304ad..6cfe920ed 100644
--- a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh
+++ b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh
@@ -9,6 +9,3 @@ chmod 755 ./vio/docker/*.*
./vio/docker/build_image.sh
-echo '========================== Building docker for vesagent =========================='
-chmod 755 ./vesagent/docker/*.*
-./vesagent/docker/docker-build.sh
diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
new file mode 100644
index 000000000..bdb5a849c
--- /dev/null
+++ b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+echo '========================== Building docker for vesagent =========================='
+chmod 755 ./vesagent/docker/*.*
+./vesagent/docker/docker-build.sh
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index dd3026a5b..6b6e9a648 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -11,9 +11,6 @@
- 'vio':
pom: 'vio/pom.xml'
pattern: 'vio/**'
- - 'vesagent':
- pom: 'vesagent/pom.xml'
- pattern: 'vesagent/**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
new file mode 100644
index 000000000..5e141a905
--- /dev/null
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
@@ -0,0 +1,25 @@
+---
+- project:
+ name: multicloud-openstack-vmware-vesagent-java
+ project-name: 'multicloud-openstack-vmware-vesagent'
+ project: 'multicloud/openstack/vmware'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-openstack-vmware-settings'
+ subproject:
+ - 'vesagent':
+ pom: 'vesagent/pom.xml'
+ pattern: 'vesagent/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g