# TODO: Is "patches" still the correct word?
IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
-# For each patch, clone the project.
-# Optionally checkout a specific patch set.
-# Also optionally, cherry-pick series of patch sets.
-# Each patch is found in the ${PATCHES_TO_BUILD} variable
-# as a comma separated list of project[=checkout][:cherry-pick]* values
+# For each patch:
+# * Clone the project.
+# * Optionally, checkout a specific (typically unmerged) Gerrit patch. If none,
+# default to Integration/Distribution branch via {branch} JJB param.
+# * Also optionally, cherry-pick series of patchs on top of the checkout.
#
-# Example: PATCHES_TO_BUILD='odlparent=45/30045/2,yangtools:53/26853/25,mdsal,controller=61/29761/5:45/29645/6,bgpcep:39/30239/1:59/30059/2'
+# Each patch is found in the ${PATCHES_TO_BUILD} variable as a comma separated
+# list of project[=checkout][:cherry-pick]* values.
#
+# Checkout a (typically unmerged) Gerrit patch on top of odlparent's git clone:
+#
+# PATCHES_TO_BUILD='odlparent=45/30045/2'
+#
+# Checkout patchs for both odlparent and yangtools.
+#
+# PATCHES_TO_BUILD='odlparent=45/30045/2,yangtools:53/26853/25'
+#
+# Checkout a patch for controller, cherry-pick another patch on top of it.
+#
+# PATCHES_TO_BUILD='controller=61/29761/5:45/29645/6'
distribution_status="not_included"
-for patch_code in "${PATCHES[@]}"
+for patch in "${PATCHES[@]}"
do
- echo "working on ${patch_code}"
- PROJECT=`echo ${patch_code} | cut -d\: -f 1 | cut -d\= -f 1`
+ echo "working on ${patch}"
+ # For patch=controller=61/29761/5:45/29645/6, this gives controller
+ PROJECT=`echo ${patch} | cut -d\: -f 1 | cut -d\= -f 1`
if [ "${PROJECT}" == "integration/distribution" ]; then
distribution_status="included"
fi
git clone "https://git.opendaylight.org/gerrit/p/${PROJECT}"
echo "<module>${PROJECT_SHORTNAME}</module>" >> ${POM_FILE}
cd ${PROJECT_SHORTNAME}
- CHECKOUT=`echo ${patch_code} | cut -d\= -s -f 2 | cut -d\: -f 1`
+ # For patch=controller=61/29761/5:45/29645/6, this gives 61/29761/5
+ CHECKOUT=`echo ${patch} | cut -d\= -s -f 2 | cut -d\: -f 1`
if [ "x${CHECKOUT}" != "x" ]; then
echo "checking out ${CHECKOUT}"
git fetch "https://git.opendaylight.org/gerrit/${PROJECT}" "refs/changes/$CHECKOUT"
echo "checking out ${DISTRIBUTION_BRANCH_TO_BUILD}"
git checkout "${DISTRIBUTION_BRANCH_TO_BUILD}"
fi
- PICK_SEGMENT=`echo "${patch_code}" | cut -d\: -s -f 2-`
+ # For patch=controller=61/29761/5:45/29645/6, this gives 45/29645/6
+ PICK_SEGMENT=`echo "${patch}" | cut -d\: -s -f 2-`
IFS=':' read -ra PICKS <<< "${PICK_SEGMENT}"
for pick in "${PICKS[@]}"
do
---
-- project:
- name: netconf-csit-cluster-stress
- jobs:
- - '{project}-csit-3node-{functionality}-{install}-{stream}'
- # The project name
- project: 'netconf'
-
- # The functionality under test
- functionality: 'cluster-stress'
-
- # Project branches
- stream:
- - nitrogen:
- branch: 'master'
- jre: 'openjdk8'
- - carbon:
- branch: 'stable/carbon'
- jre: 'openjdk8'
- karaf-version: karaf3
- - boron:
- branch: 'stable/boron'
- jre: 'openjdk8'
- karaf-version: karaf3
- - beryllium:
- branch: 'stable/beryllium'
- jre: 'openjdk7'
- karaf-version: karaf3
-
- install:
- - only:
- scope: 'only'
- - all:
- scope: 'all'
-
- # Features to install
- # odl-jolokia is added automatically just because this is a 3node job.
- # Netconf clustered feature is installed at runtime.
- install-features: >
- odl-restconf,
- odl-netconf-ssh
-
- # Robot custom options
- robot-options: '-v USE_NETCONF_CONNECTOR:False'
+# Fix this [0] before git-reverting this job.
+# [0] https://trello.com/c/SbOodkUt/490-int-nest-repair-netconf-cluster-stress-suite
# rename packer to avoid conflict with binary in cracklib
mv /usr/local/bin/packer /usr/local/bin/packer.io
-#Check out 6Wind quagga with tag name '20170330', compile and install for router functionalities
+#Check out 6Wind quagga with tag name '20170418', compile and install for router functionalities
echo "---> Installing the Quagga..."
mkdir -p /tmp/build_quagga
cd /tmp/build_quagga
git clone https://github.com/6WIND/zrpcd.git
cd zrpcd
-git checkout 20170330
+git checkout 20170418
chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
+/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2
# Removing the build_quagga folder
rm -rf /tmp/build_quagga/
# Install netaddr package which is needed by some custom mininet topologies
apt-get install python-netaddr
-#Check out 6Wind quagga with tag name '20170330', compile and install for router functionalities
-echo "---> Installing the 6Wind Quagga..."
+#Check out 6Wind quagga with tag name '20170418', compile and install for router functionalities
+echo "---> Installing the Quagga..."
mkdir -p /tmp/build_quagga
cd /tmp/build_quagga
git clone https://github.com/6WIND/zrpcd.git
cd zrpcd
-git checkout 20170330
+git checkout 20170418
chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-
-# On Ubuntu 16.04, the 6Wind Quagga top level build script needs to be enhanced to use
-# the right libboost version for this git check-in tag name '20170330'.
-sed -e 's/libboost1.55-all-dev/libboost1.58-all-dev/' \
-pkgsrc/dev_compile_script.sh > pkgsrc/dev_compile_ubuntu16.04_script.sh
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_ubuntu16.04_script.sh
-
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_ubuntu16.04_script.sh -d -b -t
+/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t -v 2
# Removing the build_quagga folder
rm -rf /tmp/build_quagga/
Code Review / releng / builder.git / commitdiff