Merge "Disable all Oxygen Jobs to save infra resources"

[releng/builder.git] / jjb / ovsdb / ovsdb-full-integration.yaml

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index affbfaf976480f84e3a56d999c74a64b2f8de51d..4bc2181f1ca58c1449c9be8772cf1a86ee32bca9 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -5,13 +5,15 @@
       - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
+          disable-job: true
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -93,12 +95,15 @@
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
 
+    disable-job: false
+
     project-type: freestyle
-    node: centos7-docker-2c-4g
-    jdk: '{jdk}'
+    node: centos7-docker-1c-4g
+    jdk: '{java-version}'
     description: >
         Integration tests for the OVSDB project against different versions of
         OVS and branches. This job runs nightly.
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -165,7 +170,7 @@
           maven-version: 'mvn33'
           stream: '{stream}'
           OVS_VERSION: '2.5.0'
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification: