summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/functest/functest.yaml38
1 files changed, 26 insertions, 12 deletions
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 9792950b7..505527523 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -10,17 +10,20 @@
tag:
- latest:
branch: master
+ slave: lf-virtual9
- iruya:
branch: stable/iruya
+ slave: lf-virtual4
- hunter:
branch: stable/hunter
+ slave: functest-virtual
- parameter:
name: functest-slave
parameters:
- label:
name: slave
- default: functest-virtual
+ default: '{slave}'
- parameter:
name: functest-branch
@@ -98,6 +101,7 @@
fi
sudo docker run --rm \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+ -e DEBUG=True \
-e EXTERNAL_NETWORK=public \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
@@ -136,7 +140,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-pull'
parameters:
- - functest-slave
+ - functest-slave:
+ slave: '{slave}'
builders:
- functest-pull-containers:
<<: *functest-containers
@@ -179,7 +184,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-rmi'
parameters:
- - functest-slave
+ - functest-slave:
+ slave: '{slave}'
builders:
- functest-remove-images:
<<: *functest-containers
@@ -222,7 +228,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-{test}-run'
parameters:
- - functest-slave
+ - functest-slave:
+ slave: '{slave}'
builders:
- functest-run-containers:
<<: *functest-run-containers
@@ -309,13 +316,14 @@
triggers:
- timed: '@daily'
parameters:
- - functest-slave
+ - functest-slave:
+ slave: '{slave}'
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+ - '^functest-{tag}-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
@@ -435,7 +443,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-gate'
parameters:
- - functest-slave
+ - functest-slave:
+ slave: '{slave}'
scm:
- functest-scm:
ref: $GERRIT_REFSPEC
@@ -447,7 +456,8 @@
- job-template:
name: 'functest-{repo}-{container}-{tag}-check'
parameters:
- - functest-slave
+ - functest-slave:
+ slave: '{slave}'
- functest-branch:
branch: '{branch}'
scm:
@@ -464,6 +474,7 @@
port:
container: alpine
tag: 3.9
+ slave: master
jobs:
- 'functest-{repo}-{container}-{tag}-rmi'
@@ -473,6 +484,7 @@
port:
container: alpine
tag: 3.9
+ slave: master
jobs:
- 'functest-{repo}-{container}-{tag}-pull'
@@ -550,7 +562,8 @@
name: 'functest-{tag}-check'
project-type: multijob
parameters:
- - functest-slave
+ - functest-slave:
+ slave: '{slave}'
- functest-branch:
branch: '{branch}'
properties:
@@ -558,7 +571,7 @@
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+ - '^functest-{tag}-(daily|check|gate)$'
builders:
- multijob:
name: remove former images
@@ -725,13 +738,14 @@
- functest-patchset-created:
branch: '{branch}'
parameters:
- - functest-slave
+ - functest-slave:
+ slave: '{slave}'
properties:
- build-blocker:
use-build-blocker: true
blocking-level: 'NODE'
blocking-jobs:
- - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+ - '^functest-{tag}-(daily|check|gate)$'
builders:
- multijob:
name: remove former images