From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 18 Jan 2023 14:27:00 +0000 (+0000)
Subject: Merge "Make node more explicit"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ecb22a34005d117f41d135be7aa7e6e209323939;hp=bd49b8ed86f2afe25dd229fbc96e3f1b7fd938fd;p=releng.git

Merge "Make node more explicit"
---

diff --git a/jjb/functest/xtesting-ci-docker.yaml b/jjb/functest/xtesting-ci-docker.yaml
index 422d7b8ed..c439d1484 100644
--- a/jjb/functest/xtesting-ci-docker.yaml
+++ b/jjb/functest/xtesting-ci-docker.yaml
@@ -55,7 +55,7 @@
     parameters:
       - label:
           name: node
-          default: 'lf-virtual1'
+          default: 'xtesting'
 
 - job-template:
     name: xtesting-ci-docker-{stream}
@@ -146,7 +146,7 @@
     parameters:
       - label:
           name: node
-          default: 'lf-virtual1'
+          default: 'xtesting'
 
 - job-template:
     name: 'xtesting-ci-docker-trivy-{stream}'
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index 20bcc33a0..61d9560f5 100644
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -56,7 +56,7 @@
 
 - project:
     name: xtesting-ci-tests
-    node: xtesting
+    node: xtestingci
     playbook:
       - all
       - proxy
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index b2fa8cbe1..cf3d2ba05 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -12,35 +12,35 @@
     port:
     tag:
       - latest:
-          node: lf-virtual1
+          node: xtesting
       - zed:
-          node: lf-virtual1
+          node: xtesting
       - yoga:
-          node: lf-virtual1
+          node: xtesting
       - xena:
-          node: lf-virtual1
+          node: xtesting
       - wallaby:
-          node: lf-virtual1
+          node: xtesting
       - arm-latest:
-          node: lf-virtual1
+          node: xtesting
       - arm-zed:
-          node: lf-virtual1
+          node: xtesting
       - arm-yoga:
-          node: lf-virtual1
+          node: xtesting
       - arm-xena:
-          node: lf-virtual1
+          node: xtesting
       - arm-wallaby:
-          node: lf-virtual1
+          node: xtesting
       - arm64-latest:
-          node: lf-virtual1
+          node: xtesting
       - arm64-zed:
-          node: lf-virtual1
+          node: xtesting
       - arm64-yoga:
-          node: lf-virtual1
+          node: xtesting
       - arm64-xena:
-          node: lf-virtual1
+          node: xtesting
       - arm64-wallaby:
-          node: lf-virtual1
+          node: xtesting
 
 - xtesting-pi-jobs: &xtesting-pi-jobs
     name: 'xtesting-pi-jobs'
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 95f987943..745b98714 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -15,31 +15,31 @@
           from:
           build_args:
           branch: master
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.16
       - zed:
           from:
           build_args:
           branch: stable/zed
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.16
       - yoga:
           from:
           build_args:
           branch: stable/yoga
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.16
       - xena:
           from:
           build_args:
           branch: stable/xena
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.14
       - wallaby:
           from:
           build_args:
           branch: stable/wallaby
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.13
 
 - xtesting-jobs: &xtesting-jobs