X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=574f20b7805e764523fb31f3fad49596b19a783f;hb=9849af885fc9b6e0e5472ba4fc8d512a9b324b95;hp=edfd0d784d8a809194b3e558c884b5112bcead26;hpb=5276fbe0260115b68cfc94a7771c23eb6bacf1e4;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index edfd0d784..574f20b78 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -5,158 +5,46 @@
     project-name: integration-test
     test-branch: master
     jobs:
-      - '{project-name}-verify-tox-master'
-      - 'integration-csit-verify-1node-library'
       - 'integration-distribution-test-{stream}'
       - 'integration-sanity-test-{stream}'
       - 'integration-patch-test-{stream}'
       - 'integration-multipatch-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
       - 'integration-distribution-high-frequency-test-trigger-{stream}'
+      - 'integration-update-csit-tests-{stream}'
+      - gerrit-tox-verify:
+          branch: master
+          stream: master
 
     # CSIT Lists in releng-defaults.yaml
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-          csit-list: '{csit-list-nitrogen}'
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide
+          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}'
+
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
+          csit-list: !include: csit-jobs-nitrogen.lst
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
-          schedule-weekly: 'H 23 * * 6'
-          csit-high-frequency-list: ''
-          schedule-high-frequency: ''
+          csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
 
       - carbon:
           branch: 'stable/carbon'
           karaf-version: karaf3
-          jdk: 'openjdk8'
-          jre: 'openjdk8'
-          csit-list: '{csit-list-carbon}'
+          csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc
+          csit-list: !include: csit-jobs-carbon.lst
           csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
-          schedule-weekly: 'H 23 * * 6'
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
-          schedule-high-frequency: 'H H/4 * * *'
-
-      - boron:
-          branch: 'stable/boron'
-          karaf-version: karaf3
-          jdk: 'openjdk8'
-          jre: 'openjdk8'
-          csit-list: '{csit-list-boron}'
-          csit-sanity-list: '{csit-sanity-list-boron}'
-          csit-weekly-list: '{csit-weekly-list-boron}'
-          schedule-weekly: 'H 23 * * 6'
-          csit-high-frequency-list: ''
-          schedule-high-frequency: ''
 
     # tools system image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150
-
-# Template: integration-csit-verify-1node-library
-# Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
-# Operation: This job template performs a base openflow test when there is a change in the libraries folder
-
-- job-template:
-    name: 'integration-csit-verify-1node-library'
-
-    project-type: freestyle
-    node: centos7-robot-2c-2g
-
-    # {stream} is already defined as a composite object, it cannot be overriden.
-    dist-stream: boron
-    # This is not a template, so define branch, scope and jre for distribution to test with.
-    branch: stable/boron
-    scope: only
-    jre: openjdk8
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{test-branch}'
-          refspec: 'refs/heads/{test-branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-branch:
-          branch: '{verify-branch}'
-      - integration-distribution-stream:
-          stream: '{verify-stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: >
-              odl-clustering-test-app,
-              odl-openflowplugin-flow-services-ui,
-              odl-openflowplugin-app-table-miss-enforcer,
-              odl-bgpcep-pcep,
-              odl-bgpcep-bgp,
-              odl-netconf-connector-all
-      # when upgrading to carbon you should replace odl-netconf-connector-all with odl-netconf-topology
-      # and change USE_NETCONF_CONNECTOR to False in test-options
-      - integration-test-options:
-          test-options: '-v TIMEOUT_BUG_4220:10s -v USE_NETCONF_CONNECTOR:True'
-      - integration-stream-test-plan:
-          stream-test-plan: 'test-libraries-{verify-stream}.txt'
-      - integration-test-plan:
-          test-plan: 'test-libraries.txt'
-      - integration-patch-refspec:
-          branch: '$GERRIT_REFSPEC'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: '{verify-karaf-version}'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: '{test-branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - integration-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{test-branch}'
-          files: 'csit/libraries/*'
-
-    builders:
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-get-slave-addresses
-      - inject:
-          properties-file: 'slave_addresses.txt'
-      - integration-detect-variables
-      - integration-deploy-controller-run-test
-      - integration-cleanup-tmp
-
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[integration]'
-      - integration-csit-archive-build
-      - lf-infra-publish
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
 # Template: integration-distribution-test-{stream}
 # Goal: Verify a distribution through all system test available
@@ -166,7 +54,7 @@
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -187,9 +75,11 @@
               KARAF_VERSION=$KARAF_VERSION
 
     publishers:
+      - opendaylight-infra-generate-csit-status-report
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
+      - lf-infra-publish
 
 # Template: integration-sanity-test-{stream}
 # Goal: Verify a distribution through sanity test
@@ -199,7 +89,7 @@
     name: 'integration-sanity-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -269,7 +159,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'test-integration'
@@ -299,6 +189,7 @@
               -Pq
               -Dstream={stream}
               {opendaylight-infra-mvn-opts}
+          # TODO: {opendaylight-infra-parallel-mvn-opts}?
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
@@ -310,7 +201,7 @@
           pom: distribution/pom.xml
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
-              {opendaylight-infra-mvn-opts}
+              {opendaylight-infra-parallel-mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
@@ -359,7 +250,7 @@
     # 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time.
 
     project-type: freestyle
-    node: centos7-java-builder-8c-8g
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     properties:
@@ -388,6 +279,19 @@
       - opendaylight-infra-wrappers:
           build-timeout: '1200'
 
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'multipatch-build:'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+
     builders:
       - wipe-org-opendaylight-repo
       - integration-multipatch-builder
@@ -402,7 +306,9 @@
               clean install dependency:tree -DoutputFile=dependency_tree.txt
               -Pq
               -Dstream={stream}
+              -Dsft.heap.max=4g
               {opendaylight-infra-mvn-opts}
+          # TODO: {opendaylight-infra-parallel-mvn-opts}?
           java-opts:
             - '-Xmx3072m -Dmaven.compile.fork=true'
           settings: integration-settings
@@ -432,7 +338,7 @@
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -464,7 +370,7 @@
     name: 'integration-distribution-high-frequency-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -491,3 +397,71 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
+
+- job-template:
+    name: 'integration-update-csit-tests-{stream}'
+
+    # This job's purpose is to update csit
+    # tests to run in integration-distribution-test-{stream}
+    # by updating integration files: csit-list-{stream}.inc
+    # These files can be used as !include in int-dist-test-{stream}
+
+    ######################
+    # Default parameters #
+    ######################
+
+    git-url: '$GIT_URL/$PROJECT'
+    submodule-recursive: true
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - lf-infra-parameters:
+          project: releng/builder  # Hardcode as this job needs to pull releng/builder
+          stream: '{stream}'
+          branch: master  # Hardcode as releng/builder only has master
+          lftools-version: '{lftools-version}'
+      - string:
+          name: CSIT_BLACKLIST
+          default: '{csit-blacklist}'
+          description: Space separated list of jobs strings to blacklist.
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: '{submodule-recursive}'
+          choosing-strategy: default
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - reverse:
+          jobs: builder-jjb-merge
+
+    builders:
+      - shell: !include-raw-escape: update-csit-tests.sh
+      - shell: |
+          git status
+          git add jjb/integration/*.lst
+      - opendaylight-infra-push-gerrit-patch:
+          project: "releng/builder"
+          gerrit-topic: "auto-update-csit-jobs-{stream}"
+          gerrit-commit-message: "Auto Update CSIT Jobs to run for {stream}"
+
+    publishers:
+      - lf-infra-publish