From 504f4891e2232eea47800c895427a8844f9861ed Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 27 Nov 2018 10:37:43 +0100
Subject: Run tox in functest-virtual
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It will replace the former jjb and avoids running functional tests if
the patchset is wrong.

Change-Id: I4264780180d953b0dac0febf1f1c2dc2d08f93c6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-virtual.yaml | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/jjb/functest/functest-virtual.yaml b/jjb/functest/functest-virtual.yaml
index 67415290e..120baa226 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
-- 
cgit 1.2.3-korg