Switch to the global-jjb tox-verify job

This will allow us to remove the verify-tox template from releng/builder in the next patch. Change-Id: I8b03c2934fefa555d3fd9f626fadea1c49e347d3 Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
opendaylight · Oct 19, 2017 · 66c2bf6 · 66c2bf6
1 parent 603cc65
commit 66c2bf6
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
@@ -6,12 +6,12 @@
       # {project-name}- is generic template, distribution- is project specific.
       - '{project-name}-clm-{stream}'
       - '{project-name}-sonar'
-      - '{project-name}-verify-tox-{stream}'
       - 'distribution-merge-{stream}'
       - 'distribution-verify-{stream}'
       - 'distribution-deploy-{stream}'
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
+      - gerrit-tox-verify
 
     project: integration/distribution
     project-name: distribution

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
@@ -5,14 +5,16 @@
     project-name: integration-test
     test-branch: master
     jobs:
-      - '{project-name}-verify-tox-master'
       - 'integration-distribution-test-{stream}'
       - 'integration-sanity-test-{stream}'
       - 'integration-patch-test-{stream}'
       - 'integration-multipatch-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
       - 'integration-distribution-high-frequency-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
+      - gerrit-tox-verify:
+          branch: master
+          stream: master
 
     # CSIT Lists in releng-defaults.yaml
     stream:

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
@@ -7,9 +7,9 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-maven-verify-dependencies
+      - gerrit-tox-verify
 
     stream:
       - oxygen:

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
@@ -3,9 +3,9 @@
     name: odlparent-master
     jobs:
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
@@ -34,9 +34,9 @@
     name: odlparent-2.0.x
     jobs:
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
@@ -68,9 +68,9 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     stream: carbon
     project: 'odlparent'

diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml
@@ -3,8 +3,8 @@
     name: ovil
     jobs:
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
+      - gerrit-tox-verify
 
     project: ovil
     project-name: ovil

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
@@ -4,9 +4,9 @@
     project-name: ansible
 
     jobs:
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-test-rpm-{stream}'
       - '{project-name}-test-deb-{stream}'
+      - gerrit-tox-verify
 
     project: 'integration/packaging/ansible-opendaylight'
 

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
@@ -4,7 +4,6 @@
     project-name: packaging
 
     jobs:
-      - '{project-name}-verify-tox-master'
       - 'packaging-build-rpm-{stream}'
       - 'packaging-build-rpm-snap-{stream}'
       - 'packaging-build-deb-{stream}'
@@ -13,6 +12,7 @@
       - 'packaging-test-rpm-master'
       - 'packaging-test-rpm-upgrade-master'
       - 'packaging-test-deb-master'
+      - gerrit-tox-verify
 
     project: 'integration/packaging'
 

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
@@ -4,9 +4,9 @@
     project-name: puppet
 
     jobs:
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-test-sanity-{stream}'
       - '{project-name}-test-full-{stream}'
+      - gerrit-tox-verify
 
     project: 'integration/packaging/puppet-opendaylight'
 

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
@@ -3,8 +3,8 @@
     name: builder-jobs
     jobs:
       - '{project-name}-ci-jobs'
-      - '{project-name}-verify-tox-{stream}'
-      - 'builder-check-poms'
+      - builder-check-poms
+      - gerrit-tox-verify
       # OpenStack Related
       - 'builder-verify-image-visibility'
       - 'builder-cleanup-old-images'

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -4,8 +4,8 @@
     jobs:
       - '{project-name}-merge-rtd-{stream}'
       - '{project-name}-verify-node-{stream}'
-      - '{project-name}-verify-python-{stream}'
-      - 'spectrometer-deploy-webapp-master'
+      - gerrit-tox-verify
+      - spectrometer-deploy-webapp-master
 
     stream:
       - master: