Merge "Remove odlparent-3.0.x jobs"

[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 660144e2fa0116173278451302997d1416235d2e..be7e06e5d9cfa93f0418ac3591288f839773eaa1 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,9 +18,18 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-sodium.lst
+          build-order: >
+              odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
+              daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
+              bgpcep integration/distribution
+
+      - neon:
+          branch: 'stable/neon'
+          mvn-version: 'mvn35'
           csit-list: !include: csit-jobs-neon.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
@@ -44,6 +53,7 @@
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
               bgpcep integration/distribution
+          disable-job: true
 
 - project:
     name: integration-distribution
@@ -57,8 +67,22 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+          csit-blacklist: >
+              alto bier capwap centinel 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 tempest wip
+              aaa-csit-1node-keystone-all
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
+              netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
+              netvirt-csit-3node-1cmb
+              last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
+          csit-list: !include: csit-jobs-sodium.lst
+          csit-weekly-list: '{csit-weekly-list-sodium}'
+          csit-high-frequency-list: '{csit-high-frequency-list-sodium}'
+      - neon:
+          branch: 'stable/neon'
           csit-blacklist: >
               alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
@@ -107,9 +131,13 @@
       - 'integration-sanity-test-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-sodium}'
+      - neon:
+          branch: 'stable/neon'
+          karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-neon}'
       - fluorine:
           branch: 'stable/fluorine'
@@ -156,6 +184,7 @@
           forbidden-files: ''
 
     builders:
+      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: odl-elastic-cloud
@@ -183,22 +212,18 @@
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-distribution-stream:
-          stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
 
     builders:
-      - integration-detect-variables
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-list}'
             block: true
             predefined-parameters: |
-              BUNDLE_URL=$ACTUAL_BUNDLE_URL
+              BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
     wrappers:
@@ -236,6 +261,7 @@
       - timed: '{schedule-daily}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-sanity-list}'
             block: true
@@ -309,6 +335,7 @@
             notbuilt: true
 
     builders:
+      - lf-infra-pre-build
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - lf-provide-maven-settings:
@@ -419,6 +446,7 @@
                   branch-pattern: '**/{branch}'
 
     builders:
+      - lf-infra-pre-build
       - wipe-org-opendaylight-repo
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -497,6 +525,7 @@
       - timed: '{schedule-high-frequency}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-high-frequency-list}'
             block: true
@@ -567,6 +596,7 @@
           jobs: builder-jjb-merge
 
     builders:
+      - lf-infra-pre-build
       - shell: !include-raw-escape: update-csit-tests.sh
       - shell: |
           git status