summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-11-27 10:37:43 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-11-27 10:55:16 +0100
commit504f4891e2232eea47800c895427a8844f9861ed (patch)
tree443567268d999e398ca996d6bdfd9adb4ee82ce1
parentb738c417b0f36a611eb5d6b2a05f2244f58c7ac0 (diff)
Run tox in functest-virtual
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>
-rw-r--r--jjb/functest/functest-virtual.yaml46
1 files changed, 46 insertions, 0 deletions
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
@@ -452,6 +488,11 @@
- '{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
- multijob:
@@ -518,6 +559,11 @@
- '{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
- multijob: