Remove all Oxygen 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..fb2caf47ee1fc44da8d6ad3680057d26f194ae31 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -18,28 +18,28 @@
 
     # CSIT Lists in defaults.yaml
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-neon.lst
+          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
 
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-fluorine.lst
+          csit-list: !include: csit-jobs-neon.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
               bgpcep integration/distribution
 
-      - oxygen:
-          branch: 'stable/oxygen'
+      - fluorine:
+          branch: 'stable/fluorine'
           mvn-version: 'mvn35'
-          csit-list: !include: csit-jobs-oxygen.lst
+          csit-list: !include: csit-jobs-fluorine.lst
           build-order: >
               odlparent yangtools infrautils mdsal controller serviceutils aaa netconf
               daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt
@@ -57,8 +57,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
@@ -85,19 +99,6 @@
           csit-list: !include: csit-jobs-fluorine.lst
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
-      - oxygen:
-          branch: 'stable/oxygen'
-          csit-blacklist: >
-              capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
-              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd tempest wip
-              aaa-csit-1node-keystone-all groupbasedpolicy-csit-1node-1cmb-0ctl-0cmp-openstack-pike-openstack
-              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-oxygen.lst
-          csit-weekly-list: '{csit-weekly-list-oxygen}'
-          csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
 
 - project:
     name: integration-sanity
@@ -107,18 +108,18 @@
       - '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'
           karaf-version: odl
           csit-sanity-list: '{csit-sanity-list-fluorine}'
-      - oxygen:
-          branch: 'stable/oxygen'
-          karaf-version: karaf4
-          csit-sanity-list: '{csit-sanity-list-oxygen}'
 
 - job-template:
     name: 'integration-merge-dashboard'
@@ -156,6 +157,7 @@
           forbidden-files: ''
 
     builders:
+      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: odl-elastic-cloud
@@ -183,22 +185,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 +234,7 @@
       - timed: '{schedule-daily}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-sanity-list}'
             block: true
@@ -309,6 +308,7 @@
             notbuilt: true
 
     builders:
+      - lf-infra-pre-build
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - lf-provide-maven-settings:
@@ -419,6 +419,7 @@
                   branch-pattern: '**/{branch}'
 
     builders:
+      - lf-infra-pre-build
       - wipe-org-opendaylight-repo
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -497,6 +498,7 @@
       - timed: '{schedule-high-frequency}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-high-frequency-list}'
             block: true
@@ -567,6 +569,7 @@
           jobs: builder-jjb-merge
 
     builders:
+      - lf-infra-pre-build
       - shell: !include-raw-escape: update-csit-tests.sh
       - shell: |
           git status