From: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Date: Wed, 20 Mar 2019 19:30:17 +0000 (-0500)
Subject: Fix HC2VPP nodes
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=7ecf9371c43163c20c51f3b96c64c022d69b22a5;p=ci-management.git

Fix HC2VPP nodes

HC2VPP is building on Ubuntu 16.04 and Ubuntu 18.04. We don't have an
18.04 image common-packer image. HC2VPP will have to switch to
common-packer in the new environment once we have an 18.04 image
available.

Change-Id: I25c5f14d53a4d6020cae3098d949b00ff996c227
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
---

diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index 912b703f1..c03aab31f 100644
--- a/jjb/hc2vpp/hc2vpp-csit.yaml
+++ b/jjb/hc2vpp/hc2vpp-csit.yaml
@@ -55,7 +55,7 @@
     name: 'hc2vpp-csit-integration-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -107,7 +107,7 @@
     name: 'hc2vpp-csit-verify-{stream}-{os}'
 
     project-type: maven
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
     concurrent: true
 
@@ -200,7 +200,7 @@
     name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     build-discarder:
@@ -254,7 +254,7 @@
     name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
 
     project-type: maven
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
     concurrent: true
 
@@ -347,7 +347,7 @@
     name: 'hc2vpp-csit-perf-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: false
 
     build-discarder:
diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 7acb4cc45..321026564 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -43,7 +43,7 @@
 - job-template:
     name: 'hc2vpp-verify-{stream}-{os}'
     project-type: maven
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -96,7 +96,7 @@
 - job-template:
     name: 'hc2vpp-verify-image-{stream}-{os}'
     project-type: maven
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -162,7 +162,7 @@
 - job-template:
     name: 'hc2vpp-merge-{stream}-{os}'
     project-type: maven
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
     build-discarder:
@@ -228,7 +228,7 @@
 - job-template:
     name: 'hc2vpp-integration-{stream}-{os}'
     project-type: maven
-    node: '{os}-builder-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     jdk: openjdk8-{os}
 
     build-discarder: