Merge "Move Barometer and Releng Builds off Master"

diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index b01a890..755eda8 100644 (file)
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -165,6 +165,7 @@
       - string:
           name: BRANCH
           default: '{branch}'
+      - opnfv-build-centos-defaults
 
     triggers:
       - timed: '@midnight'

diff --git a/jjb/releng/artifact-cleanup.yaml b/jjb/releng/artifact-cleanup.yaml
index 2a25061..f64650b 100644 (file)
--- a/jjb/releng/artifact-cleanup.yaml
+++ b/jjb/releng/artifact-cleanup.yaml
@@ -21,14 +21,13 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: master
-
     disabled: false
 
     parameters:
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
+      - opnfv-build-defaults
 
     scm:
       - git-scm