Merge "Split distribution jobs"
authorSam Hague <shague@redhat.com>
Tue, 24 Jul 2018 23:31:21 +0000 (23:31 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 24 Jul 2018 23:31:21 +0000 (23:31 +0000)
jjb/autorelease/autorelease-templates.yaml
jjb/defaults.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-macros.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/opflex/opflex-custom.yaml
jjb/packaging/ansible.yaml
jjb/packaging/packaging.yaml
jjb/packaging/puppet.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml

index f0baa163161731c932a273e7f6f2a28d0dc37922..64383697f16539d99839d1ac151df5891af76733 100644 (file)
           project: '{project}'
           branch: '{branch}'
           files: '**/*.xml'
+          forbidden-files: ''
 
     builders:
       - autorelease-checkout-gerrit-patch
index 5c5265604df57ae4f329f3d5c9350ed346b247d1..0e951d096122bc4c5e8fb790969e0e824b35d774 100644 (file)
     build-days-to-keep: 30
     use-features-boot: 'True'
 
+    # File triggers
+    files: '**'
+    forbidden-files: ''
+
     # Timeout in minutes
     build-timeout: 360
     build-node: centos7-builder-4c-4g
index ce35b2fa0ca3fac0d99debf0db17b0653e8ee4a1..95a30eefa8ab68f649dfb300c0b5d7ae1fe0ea6d 100644 (file)
@@ -3,11 +3,7 @@
     name: distribution
     jobs:
       # gerrit- is generic template, distribution- is project specific.
-      - 'distribution-merge-{stream}'
-      - 'distribution-verify-{stream}'
-      - 'distribution-check-{stream}'
       - 'distribution-sanity-{stream}'
-      - 'distribution-managed-{stream}'
       - gerrit-maven-clm
       - gerrit-maven-verify-dependencies
       - gerrit-tox-verify
@@ -21,9 +17,7 @@
     mvn-settings: integration-distribution-settings
     mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
     email-upstream: '[int/dist]'
-
     stream:
       - fluorine:
           branch: 'master'
           karaf-version: karaf4
 
 - project:
-    name: distribution-sonar
+    name: distribution-managed
     jobs:
-      - gerrit-maven-sonar
+      # gerrit- is generic template, distribution- is project specific.
+      - 'distribution-merge-{type}-{stream}'
+      - 'distribution-verify-{type}-{stream}'
+      - 'distribution-check-{type}-{stream}'
+      - 'distribution-csit-managed-{stream}'
 
     project: integration/distribution
     project-name: distribution
-    branch: master
     mvn-settings: integration-distribution-settings
-    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
+    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    email-upstream: '[int/dist]'
+    type: managed
+    profile: '-Pmanaged'
+    forbidden-files: 'opendaylight/**'
+    karaf-version: karaf4
 
-- job-template:
-    name: 'distribution-verify-{stream}'
-
-    project-type: freestyle
-    node: centos7-builder-8c-8g
-    concurrent: true
-    jdk: '{java-version}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - wipe-org-opendaylight-repo
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: 'integration-settings'
-      - maven-target:
-          maven-version: mvn35
-          pom: pom.xml
-          goals: |
-              clean install dependency:tree -DoutputFile=dependency_tree.txt
-              -Dstream={stream}
-              -Dsft.heap.max=4g
-              -Pmanaged -Punmanaged
-              {opendaylight-infra-mvn-opts}
-          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
-          java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m'
-          settings: integration-settings
-          settings-type: cfp
-          global-settings: global-settings
-          global-settings-type: cfp
-
-    publishers:
-      - findbugs
-      - lf-jacoco-report
-      - lf-infra-publish
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-
-- job-template:
-    name: 'distribution-merge-{stream}'
-
-    # Need to keep jobs that deploy to Nexus at end of build as Maven
-    # projects. Maybe reconsider this once upstream moves deploy to a
-    # separate lifecycle:
-    #     https://issues.apache.org/jira/browse/MNG-5666
-
-    project-type: maven
-    node: 'centos7-builder-8c-8g'
-    jdk: '{java-version}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          gerrit-server-name: '{gerrit-server-name}'
-          name: '{project}'
-          branch: '{branch}'
-
-    prebuilders:
-      - wipe-org-opendaylight-repo
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: 'integration-settings'
-      - integration-set-variables
-      - distribute-build-url:
-          path: '$KARAF_ARTIFACT/src/main/assembly'
-
-    maven:
-      maven-name: 'mvn35'
-      root-pom: 'pom.xml'
-      goals: >
-          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
-          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-          -Dsft.heap.max=4g
-          -Djenkins -Dmerge -Dstream={stream}
-          -Pmanaged -Punmanaged
-      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-      settings: integration-settings
-      settings-type: cfp
-      global-settings: global-settings
-      global-settings-type: cfp
-
-    postbuilders:
-      - integration-compare-distributions
-    # TODO: the output of the above command is not *friendly* for the reader because the most important info
-    # is listed last. This is fine/best for command line output, but for keeping in a file it would be better
-    # to put the summary at the beginning of the file. Some bash magic can be done here to make that happen.
-
-    reporters:
-      - findbugs
-
-    publishers:
-      - maven-deploy:
-          id: ''
-          unique-version: true
-          deploy-unstable: false
-      - lf-jacoco-report
-      - lf-infra-publish
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-
-- job-template:
-    name: 'distribution-check-{stream}'
-
-    ######################
-    # Default parameters #
-    ######################
-
-    mvn-version: mvn35
-
-    #####################
-    # Job Configuration #
-    #####################
-
-    # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
-    disabled: false
-
-    project-type: freestyle
-    node: 'centos7-builder-8c-8g'
-    concurrent: true
-    jdk: '{java-version}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-stream:
-          stream: '{stream}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-      - maven-exec:
-          maven-version: mvn35
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'distribution'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '{branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          # Distro-check jobs typically run within 10 - 30 minutes
-          # with 45 minutes being the occassional edge case.
-          # enforce a 60 minute limit to ensure stuck jobs get
-          # cleared up sooner.
-          # Double that as Karaf 3+4 may take longer.
-          build-timeout: '120'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          gerrit-server-name: '{gerrit-server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
-
-    builders:
-      - distribution-check-wipe
-      - inject:
-          properties-file: 'allowed_projects.txt'
-      - distribution-check-build-project:
-          pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-          mvn-version: '{mvn-version}'
-          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
-      - distribution-check-verify-groupid:
-          gerrit-project: 'integration'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-project-build:
-          pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-          mvn-version: '{mvn-version}'
-          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
-      - integration-set-variables
-      - distribution-check-warn-9191
-      - distribution-check-warn-9192
-      - integration-upload-distribution:
-          dist-pom: distribution/pom.xml
-      - distribution-check-bootup
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - integration-csit-archive-build
-      - lf-infra-publish
-
-- job-template:
-    name: 'distribution-sanity-{stream}'
-    # Goal: Verify distribution starts with no issues when all features are loaded.
-    # Operation: This job deploys odl-integration-all + list of UM features.
-    # This job works for both managed & self-managed distro.
-
-    project-type: freestyle
-    node: centos7-builder-4c-4g
-    concurrent: false
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-stream:
-          stream: '{stream}'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{sm-repos}'
-      - integration-controller-features:
-          controller-features: '{sm-features}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - integration-detect-variables
-      - distribution-check-bootup
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - integration-csit-archive-build
-      - lf-infra-publish
-
-- job-template:
-    name: 'distribution-managed-{stream}'
-    # Goal: Verify distribution starts with no issues when all features are loaded.
-    # Operation: This job deploys odl-integration-all.
-    # This job works for just managed distro.
+    stream:
+      - fluorine:
+          branch: 'master'
+          dependencies: >
+              aaa-merge-{stream},
+              bgpcep-merge-{stream},
+              coe-merge-{stream},
+              controller-merge-{stream},
+              daexim-merge-{stream},
+              genius-merge-{stream},
+              infrautils-merge-{stream},
+              lispflowmapping-merge-{stream},
+              mdsal-merge-{stream},
+              netconf-merge-{stream},
+              netvirt-merge-{stream}
+              neutron-merge-{stream},
+              openflowplugin-merge-{stream},
+              ovsdb-merge-{stream},
+              serviceutils-merge-{stream},
+              sfc-merge-{stream}
 
-    project-type: freestyle
-    node: centos7-builder-4c-4g
-    concurrent: false
+      - oxygen:
+          branch: 'stable/oxygen'
+          dependencies: >
+              aaa-merge-{stream},
+              alto-merge-{stream},
+              bgpcep-merge-{stream},
+              bier-merge-{stream},
+              coe-merge-{stream},
+              controller-merge-{stream},
+              daexim-merge-{stream},
+              dluxapps-merge-{stream},
+              dlux-merge-{stream},
+              faas-merge-{stream},
+              genius-merge-{stream},
+              groupbasedpolicy-merge-{stream},
+              infrautils-merge-{stream},
+              jsonrpc-merge-{stream},
+              l2switch-merge-{stream},
+              lispflowmapping-merge-{stream},
+              mdsal-merge-{stream},
+              nemo-merge-{stream},
+              netconf-merge-{stream},
+              netvirt-merge-{stream},
+              neutron-merge-{stream},
+              of-config-merge-{stream},
+              openflowplugin-merge-{stream},
+              ovsdb-merge-{stream},
+              p4plugin-merge-{stream},
+              packetcable-merge-{stream},
+              serviceutils-merge-{stream},
+              sfc-merge-{stream},
+              snmp4sdn-merge-{stream},
+              snmp-merge-{stream},
+              sxp-merge-{stream},
+              tsdr-merge-{stream},
+              usc-merge-{stream},
+              vbd-merge-{stream}
 
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+- project:
+    name: distribution-full
+    jobs:
+      # gerrit- is generic template, distribution- is project specific.
+      - 'distribution-merge-{type}-{stream}'
+      - 'distribution-verify-{type}-{stream}'
+      - 'distribution-check-{type}-{stream}'
 
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-stream:
-          stream: '{stream}'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: 'karaf4'
+    project: integration/distribution
+    project-name: distribution
+    mvn-settings: integration-distribution-settings
+    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    email-upstream: '[int/dist]'
+    type: full
+    profile: '-Punmanaged'
+    files: 'opendaylight/**'
+    karaf-version: odl
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
+    stream:
+      - fluorine:
+          branch: 'master'
+          karaf-version: odl
+          dependencies: >
+              distribution-merge-managed-{stream},
+              sxp-merge-{stream}
 
-    builders:
-      - integration-detect-variables
-      - distribution-check-bootup
+- project:
+    name: distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
 
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - integration-csit-archive-build
-      - lf-infra-publish
+    project: integration/distribution
+    project-name: distribution
+    branch: master
+    mvn-settings: integration-distribution-settings
+    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - view:
     name: distribution
index 2e3ba043b449673ddaed4363ea73f5e29eae1515..1579fb2bbf17bc0f8fe2ba7e6213a18ece11d85d 100644 (file)
           echo "detecting distribution allowed projects"
           # Some allowed projects cannot be detected in distribution because they do not produce features.
           ALLOW_PROJECTS=(yangtools mdsal openflowjava)
+          if [[ "$KARAF_VERSION" == "odl" ]]; then
           ALLOW_PROJECTS+=(`grep '<groupId>org.opendaylight.' -Rh distribution \
           | sed -e 's%^[ \t]*<groupId>org.opendaylight.%%' \
           | sed -e 's%</groupId>%%' | sort -u`)
+          else
+          # For Managed distro we only look at the features folder
+          ALLOW_PROJECTS+=(`grep '<groupId>org.opendaylight.' -Rh distribution/features \
+          | sed -e 's%^[ \t]*<groupId>org.opendaylight.%%' \
+          | sed -e 's%</groupId>%%' | sort -u`)
+          fi
           echo "Allowed projects are ${ALLOW_PROJECTS[@]}"
           echo "ALLOW_PROJECTS=${ALLOW_PROJECTS[@]}" > allowed_projects.txt
 
@@ -35,7 +42,7 @@
           goals: |
               clean deploy
               dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq -Pmanaged -Punmanaged
+              -Pq
               -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
               {mvn-opts}
           java-opts:
@@ -87,7 +94,7 @@
           goals: |
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq -Pmanaged -Punmanaged
+              -Pq
               {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
               -s fake_remotes.xml
-              -Pq -Pmanaged -Punmanaged
+              -Pq
               {mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
               -s fake_remotes.xml
-              -Pq -Pmananaged -Punmanaged
+              -Pq
               -Dsft.heap.max=4g
               -DskipTests=false
               {mvn-opts}
index 45fda0b3218e3e9445a5490e8cea136b51214b83..b86d2dd8f01f06f4b1c99bc9368f4449616cd47b 100644 (file)
@@ -69,6 +69,7 @@
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
 
     builders:
       - distribution-check-wipe
           email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish
+
+- job-template:
+    name: 'distribution-verify-{type}-{stream}'
+
+    project-type: freestyle
+    node: centos7-builder-8c-8g
+    concurrent: true
+    jdk: '{java-version}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          gerrit-server-name: '{gerrit-server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+          forbidden-files: '{forbidden-files}'
+
+    builders:
+      - wipe-org-opendaylight-repo
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: 'integration-settings'
+      - maven-target:
+          maven-version: mvn35
+          pom: pom.xml
+          goals: |
+              clean install dependency:tree -DoutputFile=dependency_tree.txt
+              -Dstream={stream}
+              -Dsft.heap.max=4g
+              {opendaylight-infra-mvn-opts}
+              {profile}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+          java-opts:
+            - '-Xmx1024m -XX:MaxPermSize=256m'
+          settings: integration-settings
+          settings-type: cfp
+          global-settings: global-settings
+          global-settings-type: cfp
+
+    publishers:
+      - findbugs
+      - lf-jacoco-report
+      - lf-infra-publish
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+
+- job-template:
+    name: 'distribution-merge-{type}-{stream}'
+
+    # Need to keep jobs that deploy to Nexus at end of build as Maven
+    # projects. Maybe reconsider this once upstream moves deploy to a
+    # separate lifecycle:
+    #     https://issues.apache.org/jira/browse/MNG-5666
+
+    project-type: maven
+    node: 'centos7-builder-8c-8g'
+    jdk: '{java-version}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          gerrit-server-name: '{gerrit-server-name}'
+          name: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+          forbidden-files: '{forbidden-files}'
+      - reverse:
+          jobs: '{dependencies}'
+
+    prebuilders:
+      - wipe-org-opendaylight-repo
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: 'integration-settings'
+      - integration-set-variables
+      - distribute-build-url:
+          path: '$KARAF_ARTIFACT/src/main/assembly'
+
+    maven:
+      maven-name: 'mvn35'
+      root-pom: 'pom.xml'
+      goals: >
+          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
+          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          -Dsft.heap.max=4g
+          -Djenkins -Dmerge -Dstream={stream}
+          {profile}
+      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      settings: integration-settings
+      settings-type: cfp
+      global-settings: global-settings
+      global-settings-type: cfp
+
+    postbuilders:
+      - integration-compare-distributions
+    # TODO: the output of the above command is not *friendly* for the reader because the most important info
+    # is listed last. This is fine/best for command line output, but for keeping in a file it would be better
+    # to put the summary at the beginning of the file. Some bash magic can be done here to make that happen.
+
+    reporters:
+      - findbugs
+
+    publishers:
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+      - lf-jacoco-report
+      - lf-infra-publish
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+
+- job-template:
+    name: 'distribution-check-{type}-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    mvn-version: mvn35
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
+    disabled: false
+
+    project-type: freestyle
+    node: 'centos7-builder-8c-8g'
+    concurrent: true
+    jdk: '{java-version}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - maven-exec:
+          maven-version: mvn35
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: 'distribution'
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          # Distro-check jobs typically run within 10 - 30 minutes
+          # with 45 minutes being the occassional edge case.
+          # enforce a 60 minute limit to ensure stuck jobs get
+          # cleared up sooner.
+          # Double that as Karaf 3+4 may take longer.
+          build-timeout: '120'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          gerrit-server-name: '{gerrit-server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+          forbidden-files: '{forbidden-files}'
+
+    builders:
+      - distribution-check-wipe
+      - inject:
+          properties-file: 'allowed_projects.txt'
+      - distribution-check-build-project:
+          pom: 'distribution/pom.xml'
+          mvn-opts: |
+              {opendaylight-infra-mvn-opts}
+              {profile}
+          mvn-version: '{mvn-version}'
+          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
+      - distribution-check-verify-groupid:
+          gerrit-project: 'integration'
+      - distribution-check-delete-snapshots
+      - distribution-check-configure-remotes
+      - distribution-check-repeat-project-build:
+          pom: 'distribution/pom.xml'
+          mvn-opts: |
+              {opendaylight-infra-mvn-opts}
+              {profile}
+          mvn-version: '{mvn-version}'
+          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
+      - integration-set-variables
+      - distribution-check-warn-9191
+      - distribution-check-warn-9192
+      - integration-upload-distribution:
+          dist-pom: distribution/pom.xml
+      - distribution-check-bootup
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - integration-csit-archive-build
+      - lf-infra-publish
+
+- job-template:
+    name: 'distribution-sanity-{stream}'
+    # Goal: Verify distribution starts with no issues when all features are loaded.
+    # Operation: This job deploys odl-integration-all + list of UM features.
+    # This job works for both managed & self-managed distro.
+
+    project-type: freestyle
+    node: centos7-builder-4c-4g
+    concurrent: false
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{sm-repos}'
+      - integration-controller-features:
+          controller-features: '{sm-features}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - integration-detect-variables
+      - distribution-check-bootup
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - integration-csit-archive-build
+      - lf-infra-publish
+
+- job-template:
+    name: 'distribution-csit-managed-{stream}'
+    # Goal: Verify distribution starts with no issues when all features are loaded.
+    # Operation: This job deploys odl-integration-all.
+    # This job works for just managed distro.
+
+    project-type: freestyle
+    node: centos7-builder-4c-4g
+    concurrent: false
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: 'karaf4'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - integration-detect-variables
+      - distribution-check-bootup
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - integration-csit-archive-build
+      - lf-infra-publish
+
index 4490a389877efc7e9403c0605dc525b1d1fe175c..d1ca270379adabc14c0176c33d56e8cad99afcfa 100644 (file)
@@ -71,6 +71,7 @@
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
 
     builders:
       - opflex-build:
           gerrit-server-name: '{gerrit-server-name}'
           name: 'opflex'
           branch: '{branch}'
+          files: '**'
+          forbidden-files: ''
 
     builders:
       - opflex-build:
index 3e8185ae9e5bf0d2b7e8b171ac1cef677dcd448d..6502165b6893a3927e001e16e79d479ec2587a71 100644 (file)
@@ -54,6 +54,8 @@
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
+
 
     publishers:
       - lf-infra-publish
@@ -97,6 +99,7 @@
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
 
     publishers:
       - lf-infra-publish
index 4d1c2b34a29d3953b4a82050c63474c077402d16..69a6cee333f81303730677e41d6051578614ff78 100644 (file)
           project: '{project}'
           branch: '{branch}'
           files: 'packages/**'
+          forbidden-files: ''
 
     publishers:
       - lf-infra-publish
index 0fd69b51c6ae0c04102384507a0fbe391e5bcf35..60d3a826ea5cbc10b78d0054732e60a11d6af3d0 100644 (file)
@@ -59,6 +59,7 @@
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
 
     publishers:
       - lf-infra-publish
index 2e1499868a28d93a8d968e96c17d38c61151a915..74f42ae9f9cbf8d95ce8bbfb408868a5c46ff669 100644 (file)
               file-paths:
                 - compare-type: ANT
                   pattern: '{files}'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: '{forbidden-files}'
 
 # TODO: Unify argument names across gerrit-trigger-* macros.
 - trigger:
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: '{files}'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: '{forbidden-files}'
           skip-vote:
             successful: true
             failed: true
index 4afb8dbdbdc806b4662051823ca40ad8ae42cfe2..1a65cab6e39062e4d0baf33bd2e3665198921dbc 100644 (file)
           gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
           branch: '{branch}'
+          files: '**'
+          forbidden-files: ''
 
     prebuilders:
       - jacoco-nojava-workaround
           deploy-unstable: false
       - lf-jacoco-report
       - lf-infra-publish
-      - trigger:
-          project: 'distribution-merge-{stream}'
-          threshold: SUCCESS