Disable blocking on buildable queue (Functest)

[releng.git] / jjb / functest / functest-virtual.yaml

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index 6741529..91dacb1 100644 (file)
--- a/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@ -311,8 +311,7 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
-          queue-scanning: 'BUILDABLE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - '{repo}-functest-.*-.*'
     parameters:
@@ -403,6 +402,42 @@
           ref: $GERRIT_REFSPEC
           <<: *functest-buildparameters
 
+- builder:
+    name: run-tox
+    builders:
+      - shell: tox -e docs,pep8,pylint,yamllint,bashate,py27,cover
+
+- 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 +481,15 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
-          queue-scanning: 'BUILDABLE'
+          blocking-level: 'NODE'
           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 +551,15 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
-          queue-scanning: 'BUILDABLE'
+          blocking-level: 'NODE'
           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