X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=a9c6328af4cb042fb3d4be0d3364b8bd49e40d22;hb=4e3d7a7845aa1042c15357e385f8ba2bea44973d;hp=3ae1fb43d05185191b6902f47906aba30bdd75a6;hpb=4b526239b3edeb5e38ea0f71eee22c423c5ad434;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 3ae1fb43d..a9c6328af 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -5,7 +5,7 @@
     project-name: integration-test
     jobs:
       - 'integration-patch-test-{stream}'
-      - 'integration-multipatch-test-{stream}'
+      - 'inttest-multipatch'
       - 'integration-merge-dashboard'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -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
+              odlparent yangtools mdsal infrautils 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
+              odlparent yangtools mdsal infrautils 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
@@ -52,52 +52,46 @@
     jobs:
       - 'integration-distribution-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
-      - 'integration-distribution-high-frequency-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
 
     # 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
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
+              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}'
+      - neon:
+          branch: 'stable/neon'
+          csit-blacklist: >
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
               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-neon.lst
           csit-weekly-list: '{csit-weekly-list-neon}'
-          csit-high-frequency-list: '{csit-high-frequency-list-neon}'
       - fluorine:
           branch: 'stable/fluorine'
           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
+              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
+              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              gate longevity sanity tdd tempest wip
               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-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 +101,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 +150,7 @@
           forbidden-files: ''
 
     builders:
+      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: odl-elastic-cloud
@@ -189,6 +184,7 @@
           karaf-version: '{karaf-version}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-list}'
             block: true
@@ -196,6 +192,11 @@
               BUNDLE_URL=$BUNDLE_URL
               KARAF_VERSION=$KARAF_VERSION
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 1440
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
     publishers:
       - opendaylight-infra-generate-csit-status-report
       - email-notification:
@@ -226,6 +227,7 @@
       - timed: '{schedule-daily}'
 
     builders:
+      - lf-infra-pre-build
       - trigger-builds:
           - project: '{csit-sanity-list}'
             block: true
@@ -299,6 +301,7 @@
             notbuilt: true
 
     builders:
+      - lf-infra-pre-build
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - lf-provide-maven-settings:
@@ -349,12 +352,13 @@
 
 
 - job-template:
-    name: 'integration-multipatch-test-{stream}'
+    name: '{prefix}integration-multipatch-test-{stream}'
     # Goal: Build one or more patches and run all available system test on a distribution containing the change.
     # Operation: This job template checks out and builds in order each patch provided in job parameters, finally
     # it creates a distribution containing all patches and triggers the distribution test job which includes most
     # (if not all) available CSIT jobs.
 
+    id: inttest-multipatch
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
@@ -365,14 +369,28 @@
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-      - patches-to-build-parameter:
-          patches_to_build: '$PATCHES_TO_BUILD'
-      - build-order-parameter:
-          build-order: '{build-order}'
-      - build-fast-parameter:
-          build-fast: 'false'
-      - run-test-parameter:
-          run-test: 'false'
+      - string:
+          name: PATCHES_TO_BUILD
+          default: '$PATCHES_TO_BUILD'
+          description: |
+              Ordered list of patches to build in the format of project=changeset (checkout) or
+              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47.
+      - string:
+          name: BUILD_ORDER
+          default: '{build-order}'
+          description: 'Build order for multipatch test when topic is used'
+      - string:
+          name: BUILD_FAST
+          default: 'true'
+          description: 'Set true to build fast -Pq'
+      - string:
+          name: BUILD_NORMAL
+          default: ''
+          description: 'List of projects to build normal (no -Pq) when BUILD_FAST=true'
+      - string:
+          name: RUN_TEST
+          default: 'false'
+          description: 'Set true to run test after build'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
@@ -409,6 +427,7 @@
                   branch-pattern: '**/{branch}'
 
     builders:
+      - lf-infra-pre-build
       - wipe-org-opendaylight-repo
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -467,38 +486,6 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
 
-- job-template:
-    name: 'integration-distribution-high-frequency-test-trigger-{stream}'
-
-    project-type: freestyle
-    node: queue-intque-2c-1g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-
-    triggers:
-      - timed: '{schedule-high-frequency}'
-
-    builders:
-      - trigger-builds:
-          - project: '{csit-high-frequency-list}'
-            block: true
-            predefined-parameters: |
-              BUNDLE_URL=$BUNDLE_URL
-              KARAF_VERSION=$KARAF_VERSION
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[integration]'
-
 - job-template:
     name: 'integration-update-csit-tests-{stream}'
 
@@ -512,6 +499,7 @@
     ######################
 
     git-url: '$GIT_URL/$PROJECT'
+    submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
 
@@ -543,6 +531,7 @@
           git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
+          submodule-disable: '{submodule-disable}'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
@@ -557,6 +546,7 @@
           jobs: builder-jjb-merge
 
     builders:
+      - lf-infra-pre-build
       - shell: !include-raw-escape: update-csit-tests.sh
       - shell: |
           git status
@@ -584,7 +574,7 @@
     job-name:
       - aaa-csit-1node-authn-all-fluorine
       - bgpcep-csit-1node-throughpcep-all-fluorine
-      - coe-csit-1node-container-networking-all-fluorine
+      - coe-csit-1node-container-networking-only-fluorine
       - controller-csit-1node-akka1-all-fluorine
       - controller-csit-1node-benchmark-all-fluorine
       - controller-csit-1node-notifications-longevity-only-fluorine
@@ -616,7 +606,21 @@
       - ovsdb-csit-3node-upstream-clustering-only-fluorine
       - sfc-csit-3node-docker-full-deploy-all-fluorine
       - sfc-csit-3node-rest-basic-all-fluorine
-    <<: *releng_view_common
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
 
 - view:
     name: csit-stable-ne
@@ -624,7 +628,7 @@
     job-name:
       - aaa-csit-1node-authn-all-neon
       - bgpcep-csit-1node-throughpcep-all-neon
-      - coe-csit-1node-container-networking-all-neon
+      - coe-csit-1node-container-networking-only-neon
       - controller-csit-1node-akka1-all-neon
       - controller-csit-1node-benchmark-all-neon
       - controller-csit-1node-notifications-longevity-only-neon
@@ -656,4 +660,18 @@
       - ovsdb-csit-3node-upstream-clustering-only-neon
       - sfc-csit-3node-docker-full-deploy-all-neon
       - sfc-csit-3node-rest-basic-all-neon
-    <<: *releng_view_common
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false