X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=98e9102433d5fbdf6d7709c65fd495caf88b28f1;hb=dfc4980a9847e3f5a2f818b9cceaab822700a459;hp=ded85ba208d09b7979df20c730a36b6fc7ee5d58;hpb=e9379cbbf67ee9f58a24e437782d92534d8b5449;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index ded85ba20..98e910243 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -13,50 +13,48 @@
       - 'integration-multipatch-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
       - 'integration-distribution-high-frequency-test-trigger-{stream}'
+      - 'integration-update-csit-tests-{stream}'
 
     # CSIT Lists in releng-defaults.yaml
     stream:
       - oxygen:
           branch: 'master'
           jdk: 'openjdk8'
-          csit-list: '{csit-list-oxygen}'
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
+          csit-list: !include: csit-jobs-oxygen.lst
           csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
-          schedule-weekly: 'H 23 * * 6'
-          csit-high-frequency-list: ''
-          schedule-high-frequency: ''
+          csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
 
       - nitrogen:
           branch: 'stable/nitrogen'
           jre: 'openjdk8'
-          csit-list: '{csit-list-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-blacklist: longevity gate sanity jsonrpc
+          csit-list: !include: csit-jobs-boron.lst
           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: ''
 
@@ -197,9 +195,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
@@ -502,3 +502,72 @@
       - 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-carbon.inc,
+    # csit-list-boron.inc, csit-list-beryllium.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-4g
+
+    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