From 908740e20202438c09ce6fee4563599dc4be552f Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 14 Dec 2022 11:40:25 +0100
Subject: Replace slave by node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ib55a55f2505d73d1c48ccbc19cc04168450468a6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
jjb/functest/functest-kubernetes-pi.yaml | 74 ++++++++++++-------------
jjb/functest/functest-kubernetes.yaml | 90 +++++++++++++++---------------
jjb/functest/functest-pi.yaml | 78 +++++++++++++-------------
jjb/functest/functest.yaml | 94 ++++++++++++++++----------------
jjb/functest/xtesting-pi.yaml | 62 ++++++++++-----------
jjb/functest/xtesting.yaml | 78 +++++++++++++-------------
6 files changed, 238 insertions(+), 238 deletions(-)
(limited to 'jjb')
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 3971e6bf5..186f88f91 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -12,46 +12,46 @@
port:
tag:
- latest:
- slave: lf-virtual1-9
+ node: lf-virtual1-9
- v1.25:
- slave: lf-virtual1-8
+ node: lf-virtual1-8
- v1.24:
- slave: lf-virtual1-7
+ node: lf-virtual1-7
- v1.23:
- slave: lf-virtual1-6
+ node: lf-virtual1-6
- v1.22:
- slave: lf-virtual1-5
+ node: lf-virtual1-5
- arm-latest:
- slave: lf-virtual1-9
+ node: lf-virtual1-9
- arm-v1.25:
- slave: lf-virtual1-8
+ node: lf-virtual1-8
- arm-v1.24:
- slave: lf-virtual1-7
+ node: lf-virtual1-7
- arm-v1.23:
- slave: lf-virtual1-6
+ node: lf-virtual1-6
- arm-v1.22:
- slave: lf-virtual1-5
+ node: lf-virtual1-5
- arm64-latest:
- slave: lf-virtual1-9
+ node: lf-virtual1-9
- arm64-v1.25:
- slave: lf-virtual1-8
+ node: lf-virtual1-8
- arm64-v1.24:
- slave: lf-virtual1-7
+ node: lf-virtual1-7
- arm64-v1.23:
- slave: lf-virtual1-6
+ node: lf-virtual1-6
- arm64-v1.22:
- slave: lf-virtual1-5
+ node: lf-virtual1-5
- functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
name: 'functest-kubernetes-pi-jobs'
current-parameters: true
- parameter:
- name: functest-kubernetes-pi-slave
+ name: functest-kubernetes-pi-node
parameters:
- label:
- name: slave
- default: '{slave}'
+ name: node
+ default: '{node}'
- parameter:
name: functest-kubernetes-pi-build_tag
@@ -134,7 +134,7 @@
-v /home/opnfv/functest-kubernetes/.boto:/etc/boto.cfg \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
- -e NODE_NAME=$slave \
+ -e NODE_NAME=$node \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
$image run_tests -t {test} -p -r
@@ -156,8 +156,8 @@
- job-template:
name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
builders:
- functest-kubernetes-pi-pull-containers:
<<: *functest-kubernetes-pi-containers
@@ -200,8 +200,8 @@
- job-template:
name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
builders:
- functest-kubernetes-pi-remove-images:
<<: *functest-kubernetes-pi-containers
@@ -244,8 +244,8 @@
- job-template:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-{test}-run'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
- functest-kubernetes-pi-build_tag:
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
@@ -277,8 +277,8 @@
- job-template:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-{test}-run'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
- functest-kubernetes-pi-build_tag:
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
@@ -323,8 +323,8 @@
- job-template:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-{test}-run'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
- functest-kubernetes-pi-build_tag:
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
@@ -357,8 +357,8 @@
- job-template:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-{test}-run'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
- functest-kubernetes-pi-build_tag:
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
@@ -390,8 +390,8 @@
- job-template:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-{test}-run'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
- functest-kubernetes-pi-build_tag:
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
@@ -468,8 +468,8 @@
- job-template:
name: 'functest-kubernetes-pi-{tag}-zip'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
- functest-kubernetes-pi-build_tag:
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
@@ -504,8 +504,8 @@
triggers:
- timed: '@weekly'
parameters:
- - functest-kubernetes-pi-slave:
- slave: '{slave}'
+ - functest-kubernetes-pi-node:
+ node: '{node}'
- functest-kubernetes-pi-build_tag:
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 349feb376..0ce9bff6e 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -15,31 +15,31 @@
from:
build_args:
branch: master
- slave: lf-virtual1-9
+ node: lf-virtual1-9
dependency: 3.15
- v1.25:
from:
build_args:
branch: stable/v1.25
- slave: lf-virtual1-8
+ node: lf-virtual1-8
dependency: 3.15
- v1.24:
from:
build_args:
branch: stable/v1.24
- slave: lf-virtual1-7
+ node: lf-virtual1-7
dependency: 3.15
- v1.23:
from:
build_args:
branch: stable/v1.23
- slave: lf-virtual1-6
+ node: lf-virtual1-6
dependency: 3.14
- v1.22:
from:
build_args:
branch: stable/v1.22
- slave: lf-virtual1-5
+ node: lf-virtual1-5
dependency: 3.14
- functest-kubernetes-jobs: &functest-kubernetes-jobs
@@ -47,11 +47,11 @@
current-parameters: true
- parameter:
- name: functest-kubernetes-slave
+ name: functest-kubernetes-node
parameters:
- label:
- name: slave
- default: '{slave}'
+ name: node
+ default: '{node}'
- parameter:
name: functest-kubernetes-build_tag
@@ -134,7 +134,7 @@
-v /home/opnfv/functest-kubernetes/.boto:/etc/boto.cfg \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
- -e NODE_NAME=$slave \
+ -e NODE_NAME=$node \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
$image run_tests -t {test} -p -r
@@ -156,8 +156,8 @@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
builders:
- functest-kubernetes-pull-containers:
<<: *functest-kubernetes-containers
@@ -200,8 +200,8 @@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
builders:
- functest-kubernetes-remove-images:
<<: *functest-kubernetes-containers
@@ -244,8 +244,8 @@
- job-template:
name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
- functest-kubernetes-build_tag:
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
@@ -277,8 +277,8 @@
- job-template:
name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
- functest-kubernetes-build_tag:
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
@@ -323,8 +323,8 @@
- job-template:
name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
- functest-kubernetes-build_tag:
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
@@ -357,8 +357,8 @@
- job-template:
name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
- functest-kubernetes-build_tag:
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
@@ -390,8 +390,8 @@
- job-template:
name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
- functest-kubernetes-build_tag:
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
@@ -468,8 +468,8 @@
- job-template:
name: 'functest-kubernetes-{tag}-zip'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
- functest-kubernetes-build_tag:
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
@@ -504,8 +504,8 @@
triggers:
- timed: '@weekly'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
- functest-kubernetes-build_tag:
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
@@ -724,8 +724,8 @@
- job-template:
name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
builders:
- functest-kubernetes-pull-dep-images:
<<: *functest-kubernetes-dep
@@ -739,8 +739,8 @@
- job-template:
name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
builders:
- functest-kubernetes-remove-dep-images:
<<: *functest-kubernetes-dep
@@ -783,8 +783,8 @@
- functest-kubernetes-patchset-created:
branch: '{branch}'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
builders:
- functest-kubernetes-tox:
@@ -797,8 +797,8 @@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
scm:
- functest-kubernetes-scm:
ref: $GERRIT_REFSPEC
@@ -886,8 +886,8 @@
- functest-kubernetes-patchset-created:
branch: '{branch}'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
- functest-kubernetes-build_tag:
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
@@ -1074,8 +1074,8 @@
- job-template:
name: 'functest-kubernetes-{repo}-{container}-{tag}-build'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
scm:
- functest-kubernetes-scm:
ref: '{branch}'
@@ -1151,8 +1151,8 @@
- functest-kubernetes-scm:
ref: '{branch}'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
# PyYAML and yamllint differ here
# see https://github.com/yaml/pyyaml/issues/234
# yamllint disable rule:indentation
@@ -1226,8 +1226,8 @@
triggers:
- timed: '@weekly'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
builders:
- functest-kubernetes-trivy:
<<: *functest-kubernetes-containers
@@ -1303,8 +1303,8 @@
triggers:
- timed: '@weekly'
parameters:
- - functest-kubernetes-slave:
- slave: '{slave}'
+ - functest-kubernetes-node:
+ node: '{node}'
builders:
- functest-kubernetes-grype:
<<: *functest-kubernetes-containers
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index e90905d8f..f05e2567e 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -12,49 +12,49 @@
port:
tag:
- latest:
- slave: lf-pod4
+ node: lf-pod4
DASHBOARD_URL: http://172.30.12.83
- zed:
- slave: lf-virtual9
+ node: lf-virtual9
DASHBOARD_URL: http://172.30.13.94
- yoga:
- slave: lf-pod4-3
+ node: lf-pod4-3
DASHBOARD_URL: http://172.30.12.88
- xena:
- slave: laas-xena
+ node: laas-xena
DASHBOARD_URL: http://10.200.120.76
- wallaby:
- slave: lf-virtual6
+ node: lf-virtual6
DASHBOARD_URL: http://172.30.13.91
- arm-latest:
- slave: lf-pod4
+ node: lf-pod4
DASHBOARD_URL: http://172.30.12.83
- arm-zed:
- slave: lf-virtual9
+ node: lf-virtual9
DASHBOARD_URL: http://172.30.13.94
- arm-yoga:
- slave: lf-pod4-3
+ node: lf-pod4-3
DASHBOARD_URL: http://172.30.12.88
- xena-latest:
- slave: laas-xena
+ node: laas-xena
DASHBOARD_URL: http://10.200.120.76
- arm-wallaby:
- slave: lf-virtual6
+ node: lf-virtual6
DASHBOARD_URL: http://172.30.13.91
- arm64-latest:
- slave: lf-pod4
+ node: lf-pod4
DASHBOARD_URL: http://172.30.12.83
- arm64-zed:
- slave: lf-virtual9
+ node: lf-virtual9
DASHBOARD_URL: http://172.30.13.94
- arm64-yoga:
- slave: lf-pod4-3
+ node: lf-pod4-3
DASHBOARD_URL: http://172.30.12.88
- arm64-xena:
- slave: laas-xena
+ node: laas-xena
DASHBOARD_URL: http://10.200.120.76
- arm64-wallaby:
- slave: lf-virtual6
+ node: lf-virtual6
DASHBOARD_URL: http://172.30.13.91
- functest-pi-jobs: &functest-pi-jobs
@@ -62,11 +62,11 @@
current-parameters: true
- parameter:
- name: functest-pi-slave
+ name: functest-pi-node
parameters:
- label:
- name: slave
- default: '{slave}'
+ name: node
+ default: '{node}'
- parameter:
name: functest-pi-build_tag
@@ -164,7 +164,7 @@
-v /home/opnfv/functest/.boto:/etc/boto.cfg \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
- -e NODE_NAME=$slave \
+ -e NODE_NAME=$node \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DASHBOARD_URL={DASHBOARD_URL} \
@@ -187,8 +187,8 @@
- job-template:
name: 'functest-pi-{repo}-{container}-{tag}-pull'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
builders:
- functest-pi-pull-containers:
<<: *functest-pi-containers
@@ -238,8 +238,8 @@
- job-template:
name: 'functest-pi-{repo}-{container}-{tag}-rmi'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
builders:
- functest-pi-remove-images:
<<: *functest-pi-containers
@@ -289,8 +289,8 @@
- job-template:
name: 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
- functest-pi-build_tag:
build_tag: ''
- functest-pi-EXTERNAL_NETWORK:
@@ -339,8 +339,8 @@
- job-template:
name: 'functest-pi-ollivier-functest-smoke-{tag}-{test}-run'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
- functest-pi-build_tag:
build_tag: ''
- functest-pi-EXTERNAL_NETWORK:
@@ -394,8 +394,8 @@
- job-template:
name: 'functest-pi-ollivier-functest-smoke-cntt-{tag}-{test}-run'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
- functest-pi-build_tag:
build_tag: ''
- functest-pi-EXTERNAL_NETWORK:
@@ -439,8 +439,8 @@
- job-template:
name: 'functest-pi-ollivier-functest-benchmarking-{tag}-{test}-run'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
- functest-pi-build_tag:
build_tag: ''
- functest-pi-EXTERNAL_NETWORK:
@@ -480,8 +480,8 @@
- job-template:
name: 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-{test}-run'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
- functest-pi-build_tag:
build_tag: ''
- functest-pi-EXTERNAL_NETWORK:
@@ -519,8 +519,8 @@
- job-template:
name: 'functest-pi-ollivier-functest-vnf-{tag}-{test}-run'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
- functest-pi-build_tag:
build_tag: ''
- functest-pi-EXTERNAL_NETWORK:
@@ -605,8 +605,8 @@
- job-template:
name: 'functest-pi-{tag}-zip'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
- functest-pi-build_tag:
build_tag: ''
- functest-pi-EXTERNAL_NETWORK:
@@ -647,8 +647,8 @@
triggers:
- timed: '@weekly'
parameters:
- - functest-pi-slave:
- slave: '{slave}'
+ - functest-pi-node:
+ node: '{node}'
- functest-pi-build_tag:
build_tag: ''
- functest-pi-EXTERNAL_NETWORK:
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 3140874a7..6e3e7f9c9 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -15,35 +15,35 @@
from:
build_args:
branch: master
- slave: lf-pod4
+ node: lf-pod4
DASHBOARD_URL: http://172.30.12.83
dependency: 3.14
- zed:
from:
build_args:
branch: stable/zed
- slave: lf-virtual9
+ node: lf-virtual9
DASHBOARD_URL: http://172.30.13.94
dependency: 3.14
- yoga:
from:
build_args:
branch: stable/yoga
- slave: lf-pod4-3
+ node: lf-pod4-3
DASHBOARD_URL: http://172.30.12.88
dependency: 3.14
- xena:
from:
build_args:
branch: stable/xena
- slave: lf-pod4-2
+ node: lf-pod4-2
DASHBOARD_URL: http://172.30.12.85
dependency: 3.14
- wallaby:
from:
build_args:
branch: stable/wallaby
- slave: lf-virtual6
+ node: lf-virtual6
DASHBOARD_URL: http://172.30.13.91
dependency: 3.13
@@ -52,11 +52,11 @@
current-parameters: true
- parameter:
- name: functest-slave
+ name: functest-node
parameters:
- label:
- name: slave
- default: '{slave}'
+ name: node
+ default: '{node}'
- parameter:
name: functest-build_tag
@@ -154,7 +154,7 @@
-v /home/opnfv/functest/.boto:/etc/boto.cfg \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
- -e NODE_NAME=$slave \
+ -e NODE_NAME=$node \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DASHBOARD_URL={DASHBOARD_URL} \
@@ -177,8 +177,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-pull'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
builders:
- functest-pull-containers:
<<: *functest-containers
@@ -228,8 +228,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-rmi'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
builders:
- functest-remove-images:
<<: *functest-containers
@@ -279,8 +279,8 @@
- job-template:
name: 'functest-opnfv-functest-healthcheck-{tag}-{test}-run'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -329,8 +329,8 @@
- job-template:
name: 'functest-opnfv-functest-smoke-{tag}-{test}-run'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -384,8 +384,8 @@
- job-template:
name: 'functest-opnfv-functest-smoke-cntt-{tag}-{test}-run'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -429,8 +429,8 @@
- job-template:
name: 'functest-opnfv-functest-benchmarking-{tag}-{test}-run'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -470,8 +470,8 @@
- job-template:
name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-{test}-run'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -509,8 +509,8 @@
- job-template:
name: 'functest-opnfv-functest-vnf-{tag}-{test}-run'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -595,8 +595,8 @@
- job-template:
name: 'functest-{tag}-zip'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -637,8 +637,8 @@
triggers:
- timed: '@weekly'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -917,8 +917,8 @@
- job-template:
name: 'functest-{repo}-{tag}-dep-pull'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
builders:
- functest-pull-dep-images:
<<: *functest-dep
@@ -932,8 +932,8 @@
- job-template:
name: 'functest-{repo}-{tag}-dep-rmi'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
builders:
- functest-remove-dep-images:
<<: *functest-dep
@@ -976,8 +976,8 @@
- functest-patchset-created:
branch: '{branch}'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
builders:
- functest-tox:
@@ -990,8 +990,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-gate'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
scm:
- functest-scm:
ref: $GERRIT_REFSPEC
@@ -1088,8 +1088,8 @@
- functest-patchset-created:
branch: '{branch}'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
- functest-build_tag:
build_tag: ''
- functest-EXTERNAL_NETWORK:
@@ -1333,8 +1333,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-build'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
scm:
- functest-scm:
ref: '{branch}'
@@ -1419,8 +1419,8 @@
- functest-scm:
ref: '{branch}'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
# PyYAML and yamllint differ here
# see https://github.com/yaml/pyyaml/issues/234
# yamllint disable rule:indentation
@@ -1493,8 +1493,8 @@
triggers:
- timed: '@weekly'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
builders:
- functest-trivy:
<<: *functest-containers
@@ -1577,8 +1577,8 @@
triggers:
- timed: '@weekly'
parameters:
- - functest-slave:
- slave: '{slave}'
+ - functest-node:
+ node: '{node}'
builders:
- functest-grype:
<<: *functest-containers
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 6b60bcaf2..5e5438be6 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -12,46 +12,46 @@
port:
tag:
- latest:
- slave: opnfv-build
+ node: opnfv-build
- zed:
- slave: opnfv-build
+ node: opnfv-build
- yoga:
- slave: opnfv-build
+ node: opnfv-build
- xena:
- slave: opnfv-build
+ node: opnfv-build
- wallaby:
- slave: opnfv-build
+ node: opnfv-build
- arm-latest:
- slave: opnfv-build
+ node: opnfv-build
- arm-zed:
- slave: opnfv-build
+ node: opnfv-build
- arm-yoga:
- slave: opnfv-build
+ node: opnfv-build
- arm-xena:
- slave: opnfv-build
+ node: opnfv-build
- arm-wallaby:
- slave: opnfv-build
+ node: opnfv-build
- arm64-latest:
- slave: opnfv-build
+ node: opnfv-build
- arm64-zed:
- slave: opnfv-build
+ node: opnfv-build
- arm64-yoga:
- slave: opnfv-build
+ node: opnfv-build
- arm64-xena:
- slave: opnfv-build
+ node: opnfv-build
- arm64-wallaby:
- slave: opnfv-build
+ node: opnfv-build
- xtesting-pi-jobs: &xtesting-pi-jobs
name: 'xtesting-pi-jobs'
current-parameters: true
- parameter:
- name: xtesting-pi-slave
+ name: xtesting-pi-node
parameters:
- label:
- name: slave
- default: '{slave}'
+ name: node
+ default: '{node}'
- parameter:
name: xtesting-pi-build_tag
@@ -127,7 +127,7 @@
-v /etc/boto.cfg:/etc/boto.cfg \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
- -e NODE_NAME=$slave \
+ -e NODE_NAME=$node \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
$image run_tests -t {test} -p -r
@@ -149,8 +149,8 @@
- job-template:
name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
parameters:
- - xtesting-pi-slave:
- slave: '{slave}'
+ - xtesting-pi-node:
+ node: '{node}'
builders:
- xtesting-pi-pull-containers:
<<: *xtesting-pi-containers
@@ -172,8 +172,8 @@
- job-template:
name: 'xtesting-pi-{repo}-{container}-{tag}-rmi'
parameters:
- - xtesting-pi-slave:
- slave: '{slave}'
+ - xtesting-pi-node:
+ node: '{node}'
builders:
- xtesting-pi-remove-images:
<<: *xtesting-pi-containers
@@ -195,8 +195,8 @@
- job-template:
name: 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
parameters:
- - xtesting-pi-slave:
- slave: '{slave}'
+ - xtesting-pi-node:
+ node: '{node}'
- xtesting-pi-build_tag:
build_tag: ''
builders:
@@ -228,8 +228,8 @@
- job-template:
name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
parameters:
- - xtesting-pi-slave:
- slave: '{slave}'
+ - xtesting-pi-node:
+ node: '{node}'
- xtesting-pi-build_tag:
build_tag: ''
builders:
@@ -299,8 +299,8 @@
- job-template:
name: 'xtesting-pi-{tag}-zip'
parameters:
- - xtesting-pi-slave:
- slave: '{slave}'
+ - xtesting-pi-node:
+ node: '{node}'
- xtesting-pi-build_tag:
build_tag: ''
builders:
@@ -330,8 +330,8 @@
triggers:
- timed: '@daily'
parameters:
- - xtesting-pi-slave:
- slave: '{slave}'
+ - xtesting-pi-node:
+ node: '{node}'
- xtesting-pi-build_tag:
build_tag: ''
# PyYAML and yamllint differ here
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 358265f23..9f38a867a 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -15,31 +15,31 @@
from:
build_args:
branch: master
- slave: opnfv-build
+ node: opnfv-build
dependency: 3.16
- zed:
from:
build_args:
branch: stable/zed
- slave: opnfv-build
+ node: opnfv-build
dependency: 3.16
- yoga:
from:
build_args:
branch: stable/yoga
- slave: opnfv-build
+ node: opnfv-build
dependency: 3.16
- xena:
from:
build_args:
branch: stable/xena
- slave: opnfv-build
+ node: opnfv-build
dependency: 3.14
- wallaby:
from:
build_args:
branch: stable/wallaby
- slave: opnfv-build
+ node: opnfv-build
dependency: 3.13
- xtesting-jobs: &xtesting-jobs
@@ -47,11 +47,11 @@
current-parameters: true
- parameter:
- name: xtesting-slave
+ name: xtesting-node
parameters:
- label:
- name: slave
- default: '{slave}'
+ name: node
+ default: '{node}'
- parameter:
name: xtesting-build_tag
@@ -127,7 +127,7 @@
-v /etc/boto.cfg:/etc/boto.cfg \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
- -e NODE_NAME=$slave \
+ -e NODE_NAME=$node \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
$image run_tests -t {test} -p -r
@@ -149,8 +149,8 @@
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-pull'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
builders:
- xtesting-pull-containers:
<<: *xtesting-containers
@@ -172,8 +172,8 @@
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-rmi'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
builders:
- xtesting-remove-images:
<<: *xtesting-containers
@@ -195,8 +195,8 @@
- job-template:
name: 'xtesting-opnfv-xtesting-{tag}-{test}-run'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
- xtesting-build_tag:
build_tag: ''
builders:
@@ -228,8 +228,8 @@
- job-template:
name: 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
- xtesting-build_tag:
build_tag: ''
builders:
@@ -299,8 +299,8 @@
- job-template:
name: 'xtesting-{tag}-zip'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
- xtesting-build_tag:
build_tag: ''
builders:
@@ -330,8 +330,8 @@
triggers:
- timed: '@daily'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
- xtesting-build_tag:
build_tag: ''
# PyYAML and yamllint differ here
@@ -492,8 +492,8 @@
- job-template:
name: 'xtesting-{repo}-{tag}-dep-pull'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
builders:
- xtesting-pull-dep-images:
<<: *xtesting-dep
@@ -507,8 +507,8 @@
- job-template:
name: 'xtesting-{repo}-{tag}-dep-rmi'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
builders:
- xtesting-remove-dep-images:
<<: *xtesting-dep
@@ -551,8 +551,8 @@
- xtesting-patchset-created:
branch: '{branch}'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
builders:
- xtesting-tox:
@@ -565,8 +565,8 @@
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-gate'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
scm:
- xtesting-scm:
ref: $GERRIT_REFSPEC
@@ -618,8 +618,8 @@
- xtesting-patchset-created:
branch: '{branch}'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
- xtesting-build_tag:
build_tag: ''
# PyYAML and yamllint differ here
@@ -740,8 +740,8 @@
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-build'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
scm:
- xtesting-scm:
ref: '{branch}'
@@ -781,8 +781,8 @@
- xtesting-scm:
ref: '{branch}'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
# PyYAML and yamllint differ here
# see https://github.com/yaml/pyyaml/issues/234
# yamllint disable rule:indentation
@@ -842,8 +842,8 @@
triggers:
- timed: '@daily'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
builders:
- xtesting-trivy:
<<: *xtesting-containers
@@ -891,8 +891,8 @@
triggers:
- timed: '@daily'
parameters:
- - xtesting-slave:
- slave: '{slave}'
+ - xtesting-node:
+ node: '{node}'
builders:
- xtesting-grype:
<<: *xtesting-containers
--
cgit