From 5339aa2a654fa53d8d43d482e72b934c2795165f Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Tue, 11 Sep 2018 17:56:22 -0700
Subject: [PATCH] Assign yardstick/barometer to ericsson-build4

This is a temporary fix until we can determine the full list of
requirements from each project needed for the opnfv-build-ubuntu labled
servers.

Previously these were building fine on ericsson-build4, so reassigning
them there should keep there builds green.

Change-Id: I767b6faa718cd6dd4b9fd17f83e7ee817cfb8c4d
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 jjb/barometer/barometer.yaml              |  4 ++--
 jjb/global/slave-params.yaml              | 16 ++++++++++++++++
 jjb/yardstick/yardstick-project-jobs.yaml |  4 ++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index 92176207f..8afe98695 100644
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -32,7 +32,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
+      - 'ericsson-build4-defaults'
 
     scm:
       - git-scm-gerrit
@@ -89,7 +89,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
+      - 'ericsson-build4-defaults'
 
     scm:
       - git-scm
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 0219be54b..65c9a2871 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -518,6 +518,22 @@
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
 
+- parameter:
+    name: 'ericsson-build4-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'ericsson-build4'
+          description: 'Slave label on Jenkins'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+
 - parameter:
     name: 'huawei-build-defaults'
     parameters:
diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml
index 56e825e19..f5fffb6ed 100644
--- a/jjb/yardstick/yardstick-project-jobs.yaml
+++ b/jjb/yardstick/yardstick-project-jobs.yaml
@@ -35,7 +35,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
+      - 'ericsson-build4-defaults'
 
     scm:
       - git-scm-gerrit
@@ -83,7 +83,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
+      - 'ericsson-build4-defaults'
       - string:
           name: GS_URL
           default: '$GS_BASE{gs-pathname}'
-- 
2.16.6