From: Aric Gardner <agardner@linuxfoundation.org>
Date: Wed, 12 Sep 2018 15:31:18 +0000 (+0000)
Subject: Merge "Assign yardstick/barometer to ericsson-build4"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=417591ec5158236ccc3a3ce8dfa6b8ad69ef06b6;hp=2d45d3ab8789ab74be79c1179dd3b773a2490f9a;p=releng.git

Merge "Assign yardstick/barometer to ericsson-build4"
---

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}'