Use label opnfv-build instead of harcoded lf-build6

Change-Id: I0fb5f1ca910fb731619a78ce91e953f3dfd7916f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/releng/opnfv-lint.yaml b/jjb/releng/opnfv-lint.yaml
index 8ac0720..7b9e55a 100644 (file)
--- a/jjb/releng/opnfv-lint.yaml
+++ b/jjb/releng/opnfv-lint.yaml
@@ -46,7 +46,7 @@
           name: SLAVE_NAME
           description: Slaves to execute yamllint
           default-slaves:
-            - lf-build6
+            - opnfv-build
           allowed-multiselect: true
           ignore-offline-nodes: true
 
@@ -98,7 +98,7 @@
           name: SLAVE_NAME
           description: Slaves to execute pylint
           default-slaves:
-            - lf-build6
+            - opnfv-build
           allowed-multiselect: true
           ignore-offline-nodes: true
 
@@ -148,7 +148,7 @@
           name: SLAVE_NAME
           description: Slaves to execute yamllint
           default-slaves:
-            - lf-build6
+            - opnfv-build
           allowed-multiselect: true
           ignore-offline-nodes: true
 

diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index 4a81c43..8dbb1a2 100644 (file)
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -24,7 +24,7 @@
           name: SLAVE_NAME
           description: Slaves to prune docker images
           default-slaves:
-            - lf-build6
+            - opnfv-build
           allowed-multiselect: true
           ignore-offline-nodes: true
 
@@ -54,7 +54,7 @@
           name: SLAVE_NAME
           description: 'script lives on master node'
           default-slaves:
-            - lf-build6
+            - opnfv-build
           allowed-multiselect: false
           ignore-offline-nodes: true
       - project-parameter:
@@ -85,7 +85,7 @@
           name: SLAVE_NAME
           description: Build Servers
           default-slaves:
-            - lf-build6
+            - opnfv-build
           allowed-multiselect: true
           ignore-offline-nodes: true
       - project-parameter:
@@ -146,7 +146,7 @@
           name: SLAVE_NAME
           description: Build Servers
           default-slaves:
-            - lf-build6
+            - opnfv-build
       - project-parameter:
           project: releng
           branch: master

diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index c01e41e..776f73f 100644 (file)
--- a/jjb/releng/releng-release-jobs.yaml
+++ b/jjb/releng/releng-release-jobs.yaml
@@ -94,7 +94,7 @@
           name: SLAVE_NAME
           description: 'Only run merge job on build5 or 6'
           default-slaves:
-            - lf-build6
+            - opnfv-build
           allowed-multiselect: false
           ignore-offline-nodes: true
       - stream-parameter: