Merge "Manage multiple slaves for functest"

diff --combined jjb/functest/functest.yaml
index d4429b3,5055275..b398e2d
--- 1/jjb/functest/functest.yaml
--- 2/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@@ -10,17 -10,20 +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,8 -101,8 +101,9 @@@
            fi
            sudo docker run --rm \
              -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+             -e DEBUG=True \
              -e EXTERNAL_NETWORK=public \
 +            -e DEBUG=true \
              -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
              -v /home/opnfv/functest/images:/home/opnfv/functest/images \
              $image run_tests -t {test}
@@@ -137,7 -140,8 +141,8 @@@
  - job-template:
      name: 'functest-{repo}-{container}-{tag}-pull'
      parameters:
-       - functest-slave
+       - functest-slave:
+           slave: '{slave}'
      builders:
        - functest-pull-containers:
            <<: *functest-containers
@@@ -180,7 -184,8 +185,8 @@@
  - job-template:
      name: 'functest-{repo}-{container}-{tag}-rmi'
      parameters:
-       - functest-slave
+       - functest-slave:
+           slave: '{slave}'
      builders:
        - functest-remove-images:
            <<: *functest-containers
@@@ -223,7 -228,8 +229,8 @@@
  - job-template:
      name: 'functest-{repo}-{container}-{tag}-{test}-run'
      parameters:
-       - functest-slave
+       - functest-slave:
+           slave: '{slave}'
      builders:
        - functest-run-containers:
            <<: *functest-run-containers
@@@ -310,13 -316,14 +317,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
@@@ -436,7 -443,8 +444,8 @@@
  - job-template:
      name: 'functest-{repo}-{container}-{tag}-gate'
      parameters:
-       - functest-slave
+       - functest-slave:
+           slave: '{slave}'
      scm:
        - functest-scm:
            ref: $GERRIT_REFSPEC
@@@ -448,7 -456,8 +457,8 @@@
  - job-template:
      name: 'functest-{repo}-{container}-{tag}-check'
      parameters:
-       - functest-slave
+       - functest-slave:
+           slave: '{slave}'
        - functest-branch:
            branch: '{branch}'
      scm:
@@@ -465,6 -474,7 +475,7 @@@
      port:
      container: alpine
      tag: 3.9
+     slave: master
      jobs:
        - 'functest-{repo}-{container}-{tag}-rmi'
  
@@@ -474,6 -484,7 +485,7 @@@
      port:
      container: alpine
      tag: 3.9
+     slave: master
      jobs:
        - 'functest-{repo}-{container}-{tag}-pull'
  
@@@ -551,7 -562,8 +563,8 @@@
      name: 'functest-{tag}-check'
      project-type: multijob
      parameters:
-       - functest-slave
+       - functest-slave:
+           slave: '{slave}'
        - functest-branch:
            branch: '{branch}'
      properties:
@@@ -559,7 -571,7 +572,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
@@@ -726,13 -738,14 +739,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