summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2018-11-28 07:02:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-28 07:02:14 +0000
commit2caa2e6d5b210efb88e28aeb21d7a945da4fb1f0 (patch)
tree03cf1ac9153d6a32798247ffca195d230f260961
parent14eb51f41f7cf67bf0c1946f2ce65a65cabaa8d3 (diff)
parent504f4891e2232eea47800c895427a8844f9861ed (diff)
Merge "Run tox in functest-virtual"
-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 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
@@ -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: