X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=97d882d1c4939d68b4baa8e9cd32b4e65f424663;hb=97b12b4b42c91a67e3743667f59970ec0d744ee0;hp=d5c471fb93e7e4875a8df308e023e332e8ad3036;hpb=88af8d1cb2b7b7a28d385a041b07a3527e60f134;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d5c471fb9..97d882d1c 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -12,39 +12,57 @@
       - 'integration-distribution-weekly-test-trigger-{stream}'
       - 'integration-distribution-high-frequency-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: integration/test
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationtest/32934/
+          rtd-token: 70766f97941a74ef80b84749ac4799e5ddeee99a
       - gerrit-tox-verify:
           branch: master
           stream: master
 
     # CSIT Lists in releng-defaults.yaml
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tdd wip
+          csit-blacklist: >
+              alto bier capwap centinel coe didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
+              l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
+              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip
+          csit-list: !include: csit-jobs-fluorine.lst
+          csit-sanity-list: '{csit-sanity-list-fluorine}'
+          csit-weekly-list: '{csit-weekly-list-fluorine}'
+          csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
+          mvn-version: 'mvn35'
+      - oxygen:
+          branch: 'stable/oxygen'
+          csit-blacklist: >
+              capwap centinel coe didm iotdm jsonrpc lacp messaging4transport netide nic
+              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-oxygen.lst
           csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
 
       - nitrogen:
           branch: 'stable/nitrogen'
-          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
+          csit-blacklist: capwap centinel coe didm iotdm jsonrpc lacp netide tsdr gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-nitrogen.lst
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
           csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
 
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-          csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc
+          csit-blacklist: capwap centinel coe jsonrpc gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-carbon.lst
           csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
 
     # tools system image
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
@@ -57,7 +75,7 @@
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-disttest-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -92,7 +110,7 @@
     name: 'integration-sanity-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -146,7 +164,7 @@
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
@@ -185,14 +203,14 @@
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: '$GERRIT_PROJECT/pom.xml'
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Pq
               -Dstream={stream}
               {opendaylight-infra-mvn-opts}
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
@@ -200,11 +218,12 @@
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: distribution/pom.xml
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
-              {opendaylight-infra-parallel-mvn-opts}
+              {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
@@ -236,7 +255,7 @@
 
     project-type: freestyle
     node: centos7-builder-4c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -260,7 +279,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -310,7 +329,7 @@
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -342,7 +361,7 @@
     name: 'integration-distribution-high-frequency-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties: