Merge "Update cloud image list docs"

[releng/builder.git] / jjb / integration / integration-test-jobs.yaml

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index cb0b81e1eb0e6e990781bc0c8ae008f4707f50ba..cca3d2bee69a887ff98f87245f8aff872aa62efe 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -5,7 +5,6 @@
     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}'
@@ -13,12 +12,14 @@
       - '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:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
           csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
           csit-list: !include: csit-jobs-oxygen.lst
           csit-sanity-list: '{csit-sanity-list-oxygen}'
@@ -27,7 +28,6 @@
 
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
           csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
           csit-list: !include: csit-jobs-nitrogen.lst
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
@@ -37,8 +37,6 @@
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-          jdk: 'openjdk8'
-          jre: 'openjdk8'
           csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc
           csit-list: !include: csit-jobs-carbon.lst
           csit-sanity-list: '{csit-sanity-list-carbon}'
@@ -46,7 +44,7 @@
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
 
     # tools system image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available