From 2a307a3121b8aae4cfb31df59ef5c6a9d668b17c Mon Sep 17 00:00:00 2001
From: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Date: Mon, 19 Dec 2016 15:25:01 -0600
Subject: [PATCH] Convert hc2vpp to be Packer compliant

Transition jobs for hc2vpp to be Packer compliant
* Modifying hc2vpp build minions to use the new node naming standard
* Temporarily using mvn33-new during cutover

Change-Id: I5367576ac90c9c823f8e76f4288afb488fc64bd4
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
---
 jjb/hc2vpp/hc2vpp.yaml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 0b8f67c60..c5581d532 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -24,7 +24,7 @@
 - job-template:
     name: 'hc2vpp-verify-{stream}-{os}'
     project-type: maven
-    node: verify-{os}
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -61,7 +61,7 @@
         - shell: |
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
-        maven-name: 'mvn33'
+        maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge site'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -77,7 +77,7 @@
 - job-template:
     name: 'hc2vpp-verify-image-{stream}-{os}'
     project-type: maven
-    node: 'verify-image-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -127,7 +127,7 @@
         - shell: |
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
     maven:
-        maven-name: 'mvn33'
+        maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -143,7 +143,7 @@
 - job-template:
     name: 'hc2vpp-merge-{stream}-{os}'
     project-type: maven
-    node: merge-{os}
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
     logrotate:
@@ -158,7 +158,9 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: 'mvn33'
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -181,7 +183,7 @@
             branch: '{branch}'
 
     maven:
-        maven-name: 'mvn33'
+        maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -204,7 +206,7 @@
 - job-template:
     name: 'hc2vpp-integration-{stream}-{os}'
     project-type: maven
-    node: merge-{os}
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
     logrotate:
@@ -219,7 +221,10 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: 'mvn33'
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -246,7 +251,7 @@
             if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
 
     maven:
-        maven-name: 'mvn33'
+        maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -257,7 +262,7 @@
 
     postbuilders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'hc2vpp-settings'
             settings-type: cfp
-- 
2.16.6