Add step in all projects merge job to trigger distribution merge

- distribution merge will be the only job uploading distros to Nexus.
- Also changing the distribution jobs name to just distribution.

Change-Id: I0bfb0b1c8fd800094d1323edd95fab8f84e80d27
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 45fe379a7e1dbb8adbe03193ce41618ad0c8536f..2641914ab823f592924e767fb446a31fd3089407 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -3,10 +3,10 @@
     name: integration-distribution
     jobs:
         - '{project-name}-verify-python-{stream}'
-        - 'integration-distribution-verify-{stream}'
-        - 'integration-distribution-merge-{stream}'
-        - 'integration-distribution-deploy-{stream}'
-        - 'integration-distribution-offline-{stream}'
+        - 'distribution-verify-{stream}'
+        - 'distribution-merge-{stream}'
+        - 'distribution-deploy-{stream}'
+        - 'distribution-offline-{stream}'
 
     project: integration/distribution
     project-name: integration-distribution
@@ -24,7 +24,7 @@
 
 
 - job-template:
-    name: 'integration-distribution-verify-{stream}'
+    name: 'distribution-verify-{stream}'
 
     project-type: maven
     node: centos7-java-builder-2c-8g
@@ -101,7 +101,7 @@
 
 
 - job-template:
-    name: 'integration-distribution-merge-{stream}'
+    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
@@ -109,7 +109,7 @@
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     project-type: maven
-    node: centos7-java-builder-2c-8g
+    node: '{build-node}'
     jdk: '{jre}'
 
     properties:
@@ -121,7 +121,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt'
 
     scm:
         - gerrit-trigger-scm:
@@ -133,7 +133,6 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             server-name: '{server-name}'
             name: 'integration/distribution'
@@ -145,6 +144,8 @@
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: 'integration-settings'
+        - distribute-build-url:
+            path: 'distribution-karaf/src/main/assembly'
 
     maven:
         maven-name: 'mvn33'
@@ -210,7 +211,7 @@
 # Operation: This job deploys the controller installing odl-integration-all
 
 - job-template:
-    name: 'integration-distribution-deploy-{stream}'
+    name: 'distribution-deploy-{stream}'
 
     project-type: freestyle
     node: centos7-java-builder-2c-8g
@@ -259,7 +260,7 @@
 # Operation: This job deploys the controller removing any external repository definition
 
 - job-template:
-    name: 'integration-distribution-offline-{stream}'
+    name: 'distribution-offline-{stream}'
 
     project-type: freestyle
     node: centos7-java-builder-2c-8g

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index c952ff116ec830ce01e5f85cb8ac5f2df9db58f7..45324bfcef19c70745c880075ac870358f06ef1a 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -505,6 +505,9 @@
         - jacoco-report
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
+        - trigger:
+            project: 'distribution-merge-{stream}'
+            threshold: SUCCESS
 
 - job-template:
     name: '{project-name}-sonar'