Merge "Run tox in functest-virtual"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 28 Nov 2018 07:02:14 +0000 (07:02 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 28 Nov 2018 07:02:14 +0000 (07:02 +0000)
jjb/functest/functest-virtual.yaml

index 2cff9fd..79f551e 100644 (file)
           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
           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
           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