From c06e1c8e810527d18b275cdae6a42d251febb3de Mon Sep 17 00:00:00 2001
From: Arun Arora <aroraarun@vmware.com>
Date: Tue, 10 Oct 2017 17:04:40 +0530
Subject: [PATCH] Jenkins Jobs for vmware vesagent

Add new yaml for vesagent Java Verify, Merge, Release and Docker jobs
Remove vesagent jobs from vmware vio yaml
Incorporate Review Comment to fix mvn-settings value

Change-Id: Ibbbb7a15cbf85381121e555c3f1e86d0ab5ec5ab
Issue-ID: MULTICLOUD-8
Signed-off-by: Arun Arora <aroraarun@vmware.com>
---
 ...ild-multicloud-openstack-vmware-docker-image.sh |  3 ---
 ...cloud-openstack-vmware-vesagent-docker-image.sh | 10 +++++++++
 .../multicloud-openstack-vmware-java.yaml          |  3 ---
 .../multicloud-openstack-vmware-vesagent-java.yaml | 25 ++++++++++++++++++++++
 4 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh
 create mode 100644 jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml

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 e2c4ec889..bc075872d 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
-- 
2.16.6