From: Morgan Richomme <morgan.richomme@orange.com>
Date: Wed, 28 Nov 2018 07:02:14 +0000 (+0000)
Subject: Merge "Run tox in functest-virtual"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2caa2e6d5b210efb88e28aeb21d7a945da4fb1f0;hp=14eb51f41f7cf67bf0c1946f2ce65a65cabaa8d3;p=releng.git

Merge "Run tox in functest-virtual"
---

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index 2cff9fd52..79f551e30 100644
--- a/jjb/functest/functest-virtual.yaml
+++ b/jjb/functest/functest-virtual.yaml
@@ -403,6 +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
@@ -451,6 +487,11 @@
           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
@@ -517,6 +558,11 @@
           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