Merge "Run integration-test job post-build"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index d70fb0d278388a74c45bf6691f626db6a2484784..b51ec75c929725a6304115f665610f044165dda1 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -82,3 +82,8 @@
         - shell: |
             uname -a
             df -h
+
+- builder:
+    name: autorelease-get-integration-test-variables
+    builders:
+    - shell: !include-raw include-raw-autorelease-get-integration-test-variables.sh

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 2e2086d2922f3fd75550fb2068f6915238e631f8..3eff19fe8ce7a46d54b52e459bcc4a0ef47d7559 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -8,8 +8,10 @@
     - beryllium:
         branch: 'master'
         jdk: 'openjdk7'
+        integration-test: beryllium
     - lithium:
         branch: 'stable/lithium'
         jdk: 'openjdk7'
+        integration-test: stable-lithium
 
     project: 'releng/autorelease'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 3a2d3ce4216d7920264ab4c351c1eae27a16c1db..d70e9997a26b93e6e9a8756676ccba78a78218f4 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -137,6 +137,7 @@
             odl-global-settings: '{odl-global-settings}'
         - autorelease-maven-deploy
         - shell: "./scripts/list-project-dependencies.sh"
+        - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
             maven-version: '{mvn33}'
             settings: '{autorelease-settings}'
@@ -145,7 +146,12 @@
         - autorelease-sys-stats
 
     publishers:
-        - archive-artifacts:
-            artifacts: '*.log,patches/*.patch'
-        - email-notification:
-            email-prefix: '[autorelease]'
+    - archive-artifacts:
+        artifacts: '*.prop,*.log,patches/*.patch'
+    - email-notification:
+        email-prefix: '[autorelease]'
+    - trigger-parameterized-builds:
+        - project: 'integration-distribution-test-{integration-test}'
+          condition: UNSTABLE
+          property-file: variables.prop
+          fail-on-missing: true

diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
new file mode 100644 (file)
index 0000000..500e0c4
--- /dev/null
+++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+##############################################################################
+# Copyright (c) 2015 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+NEXUSURL=http://nexus.opendaylight.org/content/repositories/
+VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distributions/karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
+REPOID=`grep "Closing staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
+
+echo BUNDLEURL=${NEXUSURL}/${REPOID}/org/opendaylight/integration/distribution-karaf/${VERSION}/distribution-karaf-${VERSION}.zip > $WORKSPACE/variables.prop

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index 38134b715f536c6abd2f6e7dfa116645d42ceb43..054bd5f2b778fa9c1f3d95202c30276efe1bf07f 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -19,4 +19,8 @@ for m in `xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modul
     cp -r "/tmp/r/org/opendaylight/$m" m2repo/org/opendaylight/
 done)
 
+# Add exception for integration project since they release under the
+# integration top-level project.
+cp -r "/tmp/r/org/opendaylight/integration" m2repo/org/opendaylight/
+
 mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository -DrepositoryDirectory="`pwd`/m2repo" -DnexusUrl=http://nexus.opendaylight.org/ -DstagingProfileId="21a27b7f3bbb8d" -DserverId="opendaylight.weekly" -s $AUTORELEASE_SETTINGS -gs $ODL_GLOBAL_SETTINGS | tee $WORKSPACE/deploy-staged-repository.log