Merge "Adding ability to build from different distribution branches"

diff --git a/jjb/integration/include-raw-integration-multipatch-distribution-test.sh b/jjb/integration/include-raw-integration-multipatch-distribution-test.sh
index 7d616ceb507f4910b147821065fd8438ea130f67..b84122c7a3db22d59ca9c6852d11ef5395ac3dbc 100644 (file)
--- a/jjb/integration/include-raw-integration-multipatch-distribution-test.sh
+++ b/jjb/integration/include-raw-integration-multipatch-distribution-test.sh
@@ -1,6 +1,7 @@
 # create a fresh empty place to build this custom distribution
 BUILD_DIR=${WORKSPACE}/patch_tester
 POM_FILE=${WORKSPACE}/patch_tester/pom.xml
+DISTRIBUTION_BRANCH_TO_BUILD=$BRANCH  #renaming variable for clarity
 
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
@@ -42,13 +43,11 @@ do
     git fetch https://git.opendaylight.org/gerrit/${PROJECT} refs/changes/${PATCH}
     git checkout FETCH_HEAD
     cd $BUILD_DIR
-
 done
 
+# if distribution was not cloned above, we still need to get it
 if [ "${distribution_status}" == "not_patched" ]; then
-    # clone distribution and add it as a module in root pom
     git clone https://git.opendaylight.org/gerrit/p/integration/distribution
-    # TODO: Should we add support for non-master distribution branches?
     echo "<module>distribution</module>" >> $POM_FILE
 fi
 
@@ -56,6 +55,13 @@ fi
 echo "</modules>" >> $POM_FILE
 echo "</project>" >> $POM_FILE
 
+# by default we can stay in master branch or checkout something else here
+if [ "${DISTRIBUTION_BRANCH_TO_BUILD}" != "master" ]; then
+    cd distribution
+    git checkout ${DISTRIBUTION_BRANCH_TO_BUILD}
+fi
+
+
 # Extract the BUNDLEVERSION from the distribution pom.xml
 BUNDLEVERSION=`xpath $BUILD_DIR/distribution/pom.xml '/project/version/text()' 2> /dev/null`
 echo "Bundle version is ${BUNDLEVERSION}"
@@ -65,4 +71,4 @@ echo "Bundle url is ${BUNDLEURL}"
 
 # Set BUNDLEVERSION & BUNDLEURL
 echo BUNDLEVERSION=${BUNDLEVERSION} > ${WORKSPACE}/bundle.txt
-echo BUNDLEURL=${BUNDLEURL} >> ${WORKSPACE}/bundle.txt
\ No newline at end of file
+echo BUNDLEURL=${BUNDLEURL} >> ${WORKSPACE}/bundle.txt

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 123e44d858e8a6f2fae3e3e4b8de6feca68c2951..71c0d9fb67279736b46f8c37b70db7b25a020411 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -412,6 +412,8 @@
     parameters:
         - patches-to-build-parameter:
             patches_to_build: '$PATCHES_TO_BUILD'
+        - integration-branch:
+            branch: '{branch}'
 
     wrappers:
         - build-timeout

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index cbd80dd03847b7521d635f95dfa35117b1e3f544..39678b4fa65c3827d79f0a0807d1fb9c0a3fa840 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -48,6 +48,14 @@
             default: ''
             description: 'csv list of patches in project:changeset format to build distribution with'
 
+- parameter:
+    name: distribution-branch-to-build-parameter
+    parameters:
+        - string:
+            name: DISTRIBUTION_BRANCH_TO_BUILD
+            default: 'master'
+            description: 'distribution repo branch to build with'
+
 - scm:
     name: git-scm
     scm: