From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 12 Dec 2022 17:34:44 +0000 (+0100)
Subject: Revert "Use label opnfv-build instead of harcoded lf-build6"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=10076a94d789772e73f2d6da6da1729c05dc3950;p=releng.git

Revert "Use label opnfv-build instead of harcoded lf-build6"

This reverts commit 2a2791a2eab1f870413a1617f356adc70a16de3f.

Change-Id: I3ad716423a8da4cea44d028be0e69681cf9a2507
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 6df05868e..173391596 100644
--- a/jjb/releng/opnfv-lint.yaml
+++ b/jjb/releng/opnfv-lint.yaml
@@ -40,9 +40,13 @@
       - project-parameter:
           project: $GERRIT_PROJECT
           branch: '{branch}'
-      - label:
-          name: slave
-          default: opnfv-build
+      - node:
+          name: SLAVE_NAME
+          description: Slaves to execute yamllint
+          default-slaves:
+            - lf-build6
+          allowed-multiselect: true
+          ignore-offline-nodes: true
 
     scm:
       - git-scm-gerrit
diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index 8dbb1a23c..4a81c43bf 100644
--- 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:
-            - opnfv-build
+            - lf-build6
           allowed-multiselect: true
           ignore-offline-nodes: true
 
@@ -54,7 +54,7 @@
           name: SLAVE_NAME
           description: 'script lives on master node'
           default-slaves:
-            - opnfv-build
+            - lf-build6
           allowed-multiselect: false
           ignore-offline-nodes: true
       - project-parameter:
@@ -85,7 +85,7 @@
           name: SLAVE_NAME
           description: Build Servers
           default-slaves:
-            - opnfv-build
+            - lf-build6
           allowed-multiselect: true
           ignore-offline-nodes: true
       - project-parameter:
@@ -146,7 +146,7 @@
           name: SLAVE_NAME
           description: Build Servers
           default-slaves:
-            - opnfv-build
+            - lf-build6
       - project-parameter:
           project: releng
           branch: master
diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index 776f73f85..c01e41e57 100644
--- 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:
-            - opnfv-build
+            - lf-build6
           allowed-multiselect: false
           ignore-offline-nodes: true
       - stream-parameter: