Fix yamllint for daexim

[releng/builder.git] / jjb / releng-templates-java.yaml

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index c952ff116ec830ce01e5f85cb8ac5f2df9db58f7..87a2dd943e93f579be8cae0bce737d0d298e3c9c 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -60,74 +60,6 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
-- job-template:
-    name: '{project-name}-distribution-{stream}'
-
-    # Required variables:
-    #     stream:    release stream (eg. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
-
-    # 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: '{build-node}'
-    jdk: '{jdk}'
-
-    properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: 'integration/distribution'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-
-    scm:
-        - git-scm:
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - reverse:
-            jobs: '{project}-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-        - distribute-build-url:
-            path: 'distribution-karaf/src/main/assembly'
-
-    maven:
-        maven-name: 'mvn33'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: 'integration-distribution-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-
 - job-template:
     # Template: {project-name}-distribution-check-{stream}
     # Goal: Build a patch and make sure the distribution can deploy with this change.
@@ -162,7 +94,7 @@
             refspec: '$GERRIT_REFSPEC'
             branch: '{branch}'
         - integration-distribution-scm:
-            branch: '{branch}'
+            branch: '{distribution_branch}'
 
     wrappers:
         - opendaylight-infra-wrappers:
@@ -206,7 +138,7 @@
         - shell: |
             mkdir -p /tmp/t/org/opendaylight/$GERRIT_PROJECT
             mv /tmp/n/org/opendaylight/$GERRIT_PROJECT/* /tmp/t/org/opendaylight/$GERRIT_PROJECT/
-            test -z `find /tmp/n/ -type f`
+            test `find /tmp/n/ -type f | wc -l` -eq 0
             rm -rf /tmp/n
             mv /tmp/t /tmp/n
         # Step three: Online build of integration distribution.
@@ -505,6 +437,9 @@
         - jacoco-report
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
+        - trigger:
+            project: 'distribution-merge-{stream}'
+            threshold: SUCCESS
 
 - job-template:
     name: '{project-name}-sonar'