Merge "Add extra step in the integration verify job to install distribution"

diff --git a/jjb/integration/include-raw-integration-get-bundle-url-root.sh b/jjb/integration/include-raw-integration-get-bundle-url-root.sh
new file mode 100644 (file)
index 0000000..17a2ced
--- /dev/null
+++ b/jjb/integration/include-raw-integration-get-bundle-url-root.sh
@@ -0,0 +1,13 @@
+# Extract the BUNDLEVERSION from the pom.xml
+BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
+echo "Bundle version is ${BUNDLEVERSION}"
+
+BUNDLEURL=${BUILD_URL}org.opendaylight.integration\$distribution-karaf/artifact/org.opendaylight.integration/distribution-karaf/${BUNDLEVERSION}/distribution-karaf-${BUNDLEVERSION}.zip
+echo "Bundle url is ${BUNDLEURL}"
+
+# Set BUNDLEVERSION & BUNDLEURL
+echo BUNDLEVERSION=${BUNDLEVERSION} > bundle.txt
+echo BUNDLEURL=${BUNDLEURL} >> bundle.txt
+
+# NOTE: BUNDLEVERSION & BUNDLEURL will be re-imported back into the environment with the
+# Inject environment variables plugin (next step)

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 78eb68b2a45983740554d006f2cec65096dae961..b49aa88f013ef2a9b7464456f0ad0141215ae0e9 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -56,6 +56,9 @@
             branch: '{branch}'
 
     prebuilders:
+        - integration-get-bundle-url-root
+        - inject:
+            properties-file: 'bundle.txt'
         - wipe-org-opendaylight-repo
 
     maven:
@@ -66,6 +69,14 @@
         settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
         ignore-upstream-changes: true
+        post-step-run-condition: 'SUCCESS'
+
+    postbuilders:
+        - trigger-builds:
+            - project: 'integration-csit-1node-basic-all-{stream}'
+              block: true
+              predefined-parameters:
+                  BUNDLEURL=$BUNDLEURL
 
     publishers:
         - email-notification:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 46f7cba83876cd0f98fce64006e2338857815b63..78d3b0561288be4075e8174c2655584e6f1534bd 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -240,7 +240,7 @@
             !include-raw include-raw-integration-deploy-controller-offline.sh
 
 # Macro: integration-get-bundle-url
-# Operation: this macro gets the distribution bundle URL
+# Operation: this macro gets the job generated distribution URL from distribution pom.xml
 # Used by: integration-patch-test-{stream} job template
 
 - builder:
@@ -249,6 +249,16 @@
         - shell:
             !include-raw include-raw-integration-get-bundle-url.sh
 
+# Macro: integration-get-bundle-url-root
+# Operation: this macro gets the job generated distribution URL from root pom.xml
+# Used by: integration-distribution-verify-{stream} job template
+
+- builder:
+    name: integration-get-bundle-url-root
+    builders:
+        - shell:
+            !include-raw include-raw-integration-get-bundle-url-root.sh
+
 # Macro: integration-install-robotframework
 # Operation: Installs robotframework using pip to a virtualenv
 # Used by: {project}-csit-* job templates