Make node more explicit

lf-virtual1 -> xtesting
xtesting -> xtestingci

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

diff --git a/jjb/functest/xtesting-ci-docker.yaml b/jjb/functest/xtesting-ci-docker.yaml
index 422d7b8..c439d14 100644 (file)
--- 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 20bcc33..61d9560 100644 (file)
--- 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 b2fa8cb..cf3d2ba 100644 (file)
--- 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 95f9879..745b987 100644 (file)
--- 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