Merge "Run tox in functest-virtual"

diff --combined jjb/functest/functest-virtual.yaml
index 2cff9fd,120baa2..79f551e
--- 1/jjb/functest/functest-virtual.yaml
--- 2/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@@ -311,7 -311,7 +311,7 @@@
      properties:
        - build-blocker:
            use-build-blocker: true
 -          block-level: 'NODE'
 +          blocking-level: 'NODE'
            queue-scanning: 'BUILDABLE'
            blocking-jobs:
              - '{repo}-functest-.*-.*'
@@@ -403,6 -403,42 +403,42 @@@
            ref: $GERRIT_REFSPEC
            <<: *functest-buildparameters
  
+ - builder:
+     name: run-tox
+     builders:
+       - shell: tox
+ 
+ - job-template:
+     name: '{repo}-functest-{tag}-ut-gate'
+     <<: *functest-gateparameters
+     scm:
+       - functest-scm:
+           ref: $GERRIT_REFSPEC
+     builders:
+       - run-tox:
+           ref: $GERRIT_REFSPEC
+           repo: '{repo}'
+           tag: '{tag}'
+ 
+ - job-template:
+     name: '{repo}-functest-{tag}-ut-check'
+     <<: *functest-checkparameters
+     scm:
+       - functest-scm:
+           ref: $BRANCH
+     builders:
+       - run-tox:
+           ref: $BRANCH
+           repo: '{repo}'
+           tag: '{tag}'
+ 
+ - project:
+     name: repo-functest-tag-ut-build
+     <<: *functest-defaultparameters
+     jobs:
+       - '{repo}-functest-{tag}-ut-gate'
+       - '{repo}-functest-{tag}-ut-check'
+ 
  - job-template:
      name: '{repo}-functest-{container}-{tag}-check'
      <<: *functest-checkparameters
@@@ -446,11 -482,16 +482,16 @@@
      properties:
        - build-blocker:
            use-build-blocker: true
 -          block-level: 'NODE'
 +          blocking-level: 'NODE'
            queue-scanning: 'BUILDABLE'
            blocking-jobs:
              - '{repo}-functest-.*-.*'
      builders:
+       - multijob:
+           name: run tox
+           projects:
+             - name: '{repo}-functest-{tag}-ut-gate'
+               <<: *functest-projectparameters
        - multijob:
            name: remove advanced functest containers
            <<: *functest-advcontainers-rmi
@@@ -512,11 -553,16 +553,16 @@@
      properties:
        - build-blocker:
            use-build-blocker: true
 -          block-level: 'NODE'
 +          blocking-level: 'NODE'
            queue-scanning: 'BUILDABLE'
            blocking-jobs:
              - '{repo}-functest-.*-.*'
      builders:
+       - multijob:
+           name: run tox
+           projects:
+             - name: '{repo}-functest-{tag}-ut-check'
+               <<: *functest-projectparameters
        - multijob:
            name: remove advanced functest containers
            <<: *functest-advcontainers-rmi