Switch CIRV verify/merge to use Global-JJB Tox job

This replaces the current cirv verify job that just runs 'tox' from a
bash shell, with the global-jjb tox job that first creates and
activates a Python3 virtualenv. Additionally this runs tox post-merge.

Change-Id: I4af90f08e34c417397a82391a7079fc556e6af85
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

diff --git a/jjb/cirv/cirv.yaml b/jjb/cirv/cirv.yaml
index ef9b71b..5c0bccf 100644 (file)
--- a/jjb/cirv/cirv.yaml
+++ b/jjb/cirv/cirv.yaml
@@ -1,71 +1,15 @@
 ---
-- cirv-project-params: &cirv-project-params
-    name: 'cirv-project-params'
-    tag:
-      - latest:
-          branch: master
-          slave: lf-build5
-
-- builder:
-    name: cirv-run-tox
-    builders:
-      - shell: tox
-
-- trigger:
-    name: cirv-project-patchset-created
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'cirv'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
+- project:
+    name: cirv-tox-verify
 
-- parameter:
-    name: cirv-project-slave
-    parameters:
-      - label:
-          name: slave
-          default: '{slave}'
+    project: 'cirv'
+    project-name: 'cirv'
+    build-days-to-keep: 7
 
-- scm:
-    name: cirv-project-scm
-    scm:
-      - git:
-          url: https://gerrit.opnfv.org/gerrit/cirv
-          refspec: '+refs/changes/*:refs/changes/*'
-          branches:
-            - '{ref}'
+    stream:
+      - master
 
-- job-template:
-    name: 'cirv-run-tox-{tag}'
-    triggers:
-      - cirv-project-patchset-created:
-          branch: '{branch}'
-    scm:
-      - cirv-project-scm:
-          ref: $GERRIT_REFSPEC
-    parameters:
-      - cirv-project-slave:
-          slave: '{slave}'
-    builders:
-      - cirv-run-tox
+    disabled: false
 
-- project:
-    name: 'cirv-run-tox'
-    <<: *cirv-project-params
     jobs:
-      - 'cirv-run-tox-{tag}'
+      - '{project-name}-python-jobs'