Merge "Set pass-if to 100% in every csit-related job"

diff --git a/jjb/aaa/aaa.cfg b/jjb/aaa/aaa.cfg
index bd106bfe5df38f1c3a8f4498175c93ea7f273d2e..c92ca5416df7fb758210c26a00415c2b57192549 100644 (file)
--- a/jjb/aaa/aaa.cfg
+++ b/jjb/aaa/aaa.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/alto/alto.cfg b/jjb/alto/alto.cfg
index 67b5adea43c5899784ffb25ac2c27e05b716d0e5..7e8a91ab3a322de6b6f67205b79431fa2da0d6ae 100644 (file)
--- a/jjb/alto/alto.cfg
+++ b/jjb/alto/alto.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg
index a97541e53cf51fb26bb881ec08c76c1ef41fb725..fe1d9f2ff6182d9f631a645f608ea26ae89182a3 100644 (file)
--- a/jjb/armoury/armoury.cfg
+++ b/jjb/armoury/armoury.cfg
@@ -2,5 +2,6 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk8,openjdk7
+    autorelease: true
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,mdsal

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
index f6e7e63e9203ccd68ed4a5b86b251b1debee7cbb..2b170df0ed257137984e1ad127d3609295ad8c0c 100644 (file)
--- a/jjb/bgpcep/bgpcep.cfg
+++ b/jjb/bgpcep/bgpcep.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg
index 3ca49e60167521b2740c6458ab37f1230ff1584c..5becb24c7b5ac2830619a214af8d4cadf8bed36c 100644 (file)
--- a/jjb/capwap/capwap.cfg
+++ b/jjb/capwap/capwap.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/centinel/centinel.cfg b/jjb/centinel/centinel.cfg
index 52a70e0184be17800ed012b165e0ec98a86a3e5a..ae96f12ab8f1b0bb6fb70f2a960b9f67a2d582f6 100644 (file)
--- a/jjb/centinel/centinel.cfg
+++ b/jjb/centinel/centinel.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
index 5431633ee0649537a38b5897593926231e1642a3..237183d725731870f63ae3a6fc4b12c5d6cb3eb3 100644 (file)
--- a/jjb/controller/controller.cfg
+++ b/jjb/controller/controller.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/dlux/dlux.cfg b/jjb/dlux/dlux.cfg
index fb1e37caf2cdd9bed100adfd3e110678c800d16f..81bc06d8cc5df5b000574f09de4a8ea50f557164 100644 (file)
--- a/jjb/dlux/dlux.cfg
+++ b/jjb/dlux/dlux.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/docs/docs.cfg b/jjb/docs/docs.cfg
index fb1e37caf2cdd9bed100adfd3e110678c800d16f..81bc06d8cc5df5b000574f09de4a8ea50f557164 100644 (file)
--- a/jjb/docs/docs.cfg
+++ b/jjb/docs/docs.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/faas/faas.cfg b/jjb/faas/faas.cfg
index 2bdec41693cf90363d51ad1e7650192dddc1b76c..916bcc46e4653ba67e3e945036c599ccd296fd58 100644 (file)
--- a/jjb/faas/faas.cfg
+++ b/jjb/faas/faas.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.cfg b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
index c9673ee50f73daa68820af7150b4e7287b628010..b5a4f54704404b4614b0f3d76ba2431ecfdb7e57 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.cfg
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/integration/include-raw-integration-cleanup-tmp.sh b/jjb/integration/include-raw-integration-cleanup-tmp.sh
index ece0fa69c315db2408eedf819c372300fff254ef..f1e8255f95ea607a1c2c7754e363f8b4d2ecd4c4 100644 (file)
--- a/jjb/integration/include-raw-integration-cleanup-tmp.sh
+++ b/jjb/integration/include-raw-integration-cleanup-tmp.sh
@@ -1,4 +1,6 @@
-# Cleanup Robot
+echo "Cleaning up Robot installation..."
+
 # ${ROBOT_VENV} comes from the include-raw-integration-install-robotframework.sh
 # script.
+# TODO: Is this still needed when we have integration-cleanup-workspace?
 rm -rf ${ROBOT_VENV}

diff --git a/jjb/integration/include-raw-integration-cleanup-workspace.sh b/jjb/integration/include-raw-integration-cleanup-workspace.sh
new file mode 100644 (file)
index 0000000..32c9030
--- /dev/null
+++ b/jjb/integration/include-raw-integration-cleanup-workspace.sh
@@ -0,0 +1,9 @@
+echo "Cleaning up the workspace..."
+
+# Leftover files from previous runs could be wrongly copied as results.
+# Keep the cloned integration/test repository!
+for file_or_dir in `ls -A -1 -I "test"`
+# FIXME: Make this compatible with multipatch and other possible build&run jobs.
+do
+  rm -vrf "$file_or_dir"
+done

diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index bb25495c928a2ffa8b92fcc254590df5bc0855df..c22bfcbd201d9050490f97fc44a4e636755714d0 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -20,7 +20,9 @@ cat ${FEATURESCONF}
 
 echo "Configuring the log..."
 LOGCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' ${LOGCONF}
+sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
+# FIXME: Make log size limit configurable from build parameter.
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' ${LOGCONF}
 cat ${LOGCONF}
 
 echo "Configure the repos..."
@@ -40,14 +42,16 @@ ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 echo "sleeping for 10 seconds..."
 sleep 10
 
-echo "Install all features"
+echo "Installing all features..."
 sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > ${WORKSPACE}/error.txt
 
-echo "Fetching Karaf log"
-cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
-
-echo "Kill controller"
+echo "Killing ODL and fetching Karaf log..."
+head --bytes=1M "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
+# TODO: Do we want different name for karaf.log chunk to signal it may be not complete?
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
+sleep 5
+xz -9ekvv "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
+mv "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log.xz" .
 
 echo "Exit with error"
 if [ -f ${WORKSPACE}/error.txt ]; then

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index ff0d118fbed29c1b1a63baf39d23935284079dbd..14e456c00566c65651c750cbb9823ccbfc452a18 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -43,7 +43,9 @@ cat \${FEATURESCONF}
 
 echo "Configuring the log..."
 LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' \${LOGCONF}
+sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' \${LOGCONF}
+# FIXME: Make log size limit configurable from build parameter.
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
 cat \${LOGCONF}
 
 echo "Configure max memory..."
@@ -51,7 +53,7 @@ MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
 sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF}
 cat \${MEMCONF}
 
-echo "Listing all open ports on controller system"
+echo "Listing all open ports on controller system..."
 netstat -natu
 
 echo "Starting controller..."
@@ -68,7 +70,7 @@ while true; do
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+        head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Listing all open ports on controller system"
         netstat -natu
         exit 1
@@ -85,7 +87,7 @@ sleep 60
 echo "Checking OSGi bundles..."
 sshpass -p karaf /tmp/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
 
-echo "Listing all open ports on controller system"
+echo "Listing all open ports on controller system..."
 netstat -natu
 
 function exit_on_log_file_message {
@@ -93,7 +95,7 @@ function exit_on_log_file_message {
     if grep --quiet "\$1" /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then
         echo ABORTING: found "\$1"
         echo "Dumping Karaf log..."
-        cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+        head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         exit 1
     fi
 }
@@ -121,8 +123,14 @@ pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v W
 -v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
 -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
 
-echo "Fetching Karaf log"
-scp ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log .
+echo "Killing ODL and fetching Karaf log..."
+set +e  # We do not want to create red dot just because something went wrong while fetching logs.
+ssh "${ODL_SYSTEM_IP}" head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
+ssh "${ODL_SYSTEM_IP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
+sleep 5
+ssh "${ODL_SYSTEM_IP}" xz -9ekvv "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+scp "${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.xz" .
+true  # perhaps Jenkins is testing last exit code
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
 

diff --git a/jjb/integration/include-raw-integration-deploy-controller.sh b/jjb/integration/include-raw-integration-deploy-controller.sh
index 66028199355a90c2d78a7d36cff92087bb4b1036..5aabfb41f96e64f783772c5caa9e985faacd9b82 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller.sh
@@ -30,7 +30,9 @@ cat \${FEATURESCONF}
 
 echo "Configuring the log..."
 LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' \${LOGCONF}
+sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' \${LOGCONF}
+# FIXME: Make log size limit configurable from build parameter.
+sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=100GB/g' \${LOGCONF}
 cat \${LOGCONF}
 
 echo "Configure max memory..."

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/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index 37cc3e4d004845ad27e4e2ec2fc9ebb2bf869c2d..4f92934c00ec9d395b96b449034fac9c830b97ce 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -26,7 +26,7 @@ while true; do
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+        head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Listing all open ports on controller system"
         netstat -natu
         exit 1
@@ -40,15 +40,15 @@ done
 echo "Checking OSGi bundles..."
 sshpass -p karaf /tmp/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
 
-echo "Listing all open ports on controller system"
+echo "Listing all open ports on controller system.."
 netstat -natu
 
 function exit_on_log_file_message {
     echo "looking for \"\$1\" in log file"
-    if grep --quiet "\$1" /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then
+    if grep --quiet "\$1" "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"; then
         echo ABORTING: found "\$1"
         echo "Dumping Karaf log..."
-        cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+        head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         exit 1
     fi
 }
@@ -73,7 +73,7 @@ echo "Changing the testplan path..."
 cat ${WORKSPACE}/test/csit/testplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > testplan.txt
 cat testplan.txt
 
-SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
+SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 
 echo "Generating controller variables..."
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
@@ -97,15 +97,22 @@ TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} -v NUM_TOOLS_SYSTEM:${NUM_
 -v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
 -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
 
-echo "Remove any Karaf log"
-rm -f controller?-karaf.log
-
-echo "Fetching Karaf log"
+echo "Killing ODL and fetching Karaf log..."
+set +e  # We do not want to create red dot just because something went wrong while fetching logs.
+for i in `seq 1 ${NUM_ODL_SYSTEM}`
+do
+    CONTROLLERIP=ODL_SYSTEM_${i}_IP
+    ssh "${!CONTROLLERIP}" head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "odl${i}_karaf.log"
+    ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
+done
+sleep 5
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    scp ${!CONTROLLERIP}:/tmp/$BUNDLEFOLDER/data/log/karaf.log controller${i}-karaf.log
+    ssh "${!CONTROLLERIP}" xz -9ekvv "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.xz" "odl${i}_karaf.log.xz"
 done
+true  # perhaps Jenkins is testing last exit code
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
 

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 6c8389a5b2f2ea10678eb1bda1080840279303df..bd34eae001aec17c92bcc4efc804c46f091ec954 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -300,6 +300,16 @@
         - shell:
             !include-raw include-raw-integration-multipatch-distribution-test.sh
 
+# Macro: integration-cleanup-worspace
+# Operation: Cleans up files possibly left there by the previous build
+# Used by: {project}-csit-* job templates
+
+- builder:
+    name: integration-cleanup-workspace
+    builders:
+        - shell:
+            !include-raw include-raw-integration-cleanup-workspace.sh
+
 ##############
 # Publishers #
 ##############

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f954d3704d33fe66c5bc23b3ab564f45f8fc6d7c..9833f911e5b08aa9ca0791d382a13c428cba4cef 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -80,6 +80,7 @@
             pattern: 'csit/suites/{project}/**'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -97,7 +98,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
 
@@ -155,6 +156,7 @@
             result: 'success'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -172,7 +174,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -258,6 +260,7 @@
             pattern: 'csit/suites/{project}/**'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -275,7 +278,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
 
@@ -333,6 +336,7 @@
             result: 'success'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -350,7 +354,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -430,6 +434,7 @@
         - timed: '{schedule}'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -447,7 +452,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -529,6 +534,7 @@
             pattern: 'csit/suites/{project}/**'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -548,7 +554,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log'
+            artifacts: '*karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
 
@@ -606,6 +612,7 @@
             result: 'success'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -625,7 +632,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log'
+            artifacts: '*karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -705,6 +712,7 @@
         - timed: '{schedule}'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -724,7 +732,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log'
+            artifacts: '*karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index d15f10ea85145827fc1a5067000c12268bbecb2a..07cac23fd9bc4c82220390ba66009bb0673a4c45 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -206,7 +206,11 @@
         - integration-controller-scope:
             controller-scope: 'only'
         - integration-controller-features:
-            controller-features: 'odl-openflowplugin-flow-services-ui,odl-bgpcep-pcep-all,odl-bgpcep-pcep,odl-netconf-connector-all'
+            controller-features: >
+                odl-openflowplugin-flow-services-ui,
+                odl-bgpcep-pcep,
+                odl-bgpcep-bgp,
+                odl-netconf-connector-all
         - integration-test-options:
             test-options: '-e adsal'
         - integration-test-plan:
@@ -239,6 +243,7 @@
             pattern: 'csit/libraries/*'
 
     builders:
+        - integration-cleanup-workspace
         - integration-install-robotframework
         - inject:
             properties-file: 'env.properties'
@@ -256,7 +261,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[integration]'
 
@@ -412,6 +417,8 @@
     parameters:
         - patches-to-build-parameter:
             patches_to_build: '$PATCHES_TO_BUILD'
+        - integration-branch:
+            branch: '{branch}'
 
     wrappers:
         - build-timeout

diff --git a/jjb/iotdm/iotdm.cfg b/jjb/iotdm/iotdm.cfg
index 016f03f6afe3b76455459f78fe13cffa83c1149e..0176c40e1064de0cfc322a63457ba5e4ebd7b010 100644 (file)
--- a/jjb/iotdm/iotdm.cfg
+++ b/jjb/iotdm/iotdm.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg
index 7a6beb9b45d683ed08a5fe622278dc5e62ff0171..1575192d50c3dc1bcd027ae9481826cab25efac3 100644 (file)
--- a/jjb/l2switch/l2switch.cfg
+++ b/jjb/l2switch/l2switch.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/lacp/lacp.cfg b/jjb/lacp/lacp.cfg
index c210ca33b733f126afafdfdf1ea1f9e97726bb5f..2f8e5b91d8a4e39e0d7457c4f6253c1f6b8794b4 100644 (file)
--- a/jjb/lacp/lacp.cfg
+++ b/jjb/lacp/lacp.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg
index 94384d31f13feed19394956872c96fb1a4d6f3bd..d6370749b2676e6f7cb2509da057e543ba96ec6e 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.cfg
+++ b/jjb/lispflowmapping/lispflowmapping.cfg
@@ -3,6 +3,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg
index dc95a8bf5700d397c03c2b06494501124c8f1d8d..2f2b41a2c837e5bfe7bf1f038a703691f271d070 100644 (file)
--- a/jjb/mdsal/mdsal.cfg
+++ b/jjb/mdsal/mdsal.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m
 DEPENDENCIES: odlparent,yangtools

diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg
index c36b85882d0c0a379dbb6112a0f45d6d3d13f880..1b5d748dddbdf9b09567f8ed002b0876daf56c72 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.cfg
+++ b/jjb/messaging4transport/messaging4transport.cfg
@@ -3,3 +3,4 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true

diff --git a/jjb/nemo/nemo.cfg b/jjb/nemo/nemo.cfg
index 2bdec41693cf90363d51ad1e7650192dddc1b76c..916bcc46e4653ba67e3e945036c599ccd296fd58 100644 (file)
--- a/jjb/nemo/nemo.cfg
+++ b/jjb/nemo/nemo.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
index b7815c7fc5d01c46c165cb33957e1070e7f6999e..a4b52c9fa29cd0fd98121462dd917fa45c215ed2 100644 (file)
--- a/jjb/netconf/netconf.cfg
+++ b/jjb/netconf/netconf.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: aaa,controller,odlparent,yangtools

diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg
index cddb697b9398093fab469c6bef040155f6824170..1c1a46a2011f1b7fbf59191a10cd0a3910ade4ed 100644 (file)
--- a/jjb/netide/netide.cfg
+++ b/jjb/netide/netide.cfg
@@ -2,5 +2,6 @@ STREAMS:
 - beryllium:\r
     branch: master\r
     jdks: openjdk7,openjdk8\r
+    autorelease: true\r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m\r
 DEPENDENCIES: odlparent,yangtools,controller,openflowjava\r

diff --git a/jjb/neutron/neutron.cfg b/jjb/neutron/neutron.cfg
index 78f57074f23c7ecebe0a0f588103bf3b1f0779af..81908b1e0ec35cd198fa104bd4104e057e408f69 100644 (file)
--- a/jjb/neutron/neutron.cfg
+++ b/jjb/neutron/neutron.cfg
@@ -3,6 +3,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg
index 52a70e0184be17800ed012b165e0ec98a86a3e5a..ae96f12ab8f1b0bb6fb70f2a960b9f67a2d582f6 100644 (file)
--- a/jjb/next/next.cfg
+++ b/jjb/next/next.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/nic/nic.cfg b/jjb/nic/nic.cfg
index a6a0e31d57bbef567474cdd09492b5ec26f248cd..bdfd27c3f974e9418c3873741ec1dfb15b4b70a4 100644 (file)
--- a/jjb/nic/nic.cfg
+++ b/jjb/nic/nic.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/odlparent/odlparent.cfg b/jjb/odlparent/odlparent.cfg
index fb1e37caf2cdd9bed100adfd3e110678c800d16f..81bc06d8cc5df5b000574f09de4a8ea50f557164 100644 (file)
--- a/jjb/odlparent/odlparent.cfg
+++ b/jjb/odlparent/odlparent.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/of-config/of-config.cfg b/jjb/of-config/of-config.cfg
index e76cbf487b5327f68e7d9398dc430af72dda2750..15361094e4bd9011c124446b80ed2c8dbdf06a84 100644 (file)
--- a/jjb/of-config/of-config.cfg
+++ b/jjb/of-config/of-config.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent,netconf

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
index 13729319b7b7d1a6862813879475957af9b44ae6..8f3575638c091a76fa3768bc0cced4f0ed8f1366 100644 (file)
--- a/jjb/openflowjava/openflowjava.cfg
+++ b/jjb/openflowjava/openflowjava.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
index 29c006292470d4f2b65ab06ddef3c1f4622a0796..5b4caaaedfbe517a4264f132bd98918c22c86894 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 006ae34dee3f18069446b3314e0573a20a4da49e..3dfa07f72bd2f578fbb2e6225777427830e785ab 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -14,6 +14,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg
index 16c40cabac467f2ea57cd51f36606f7582f72933..9a57eb4be0e65260695d4fb62970d471a69a6d8a 100644 (file)
--- a/jjb/packetcable/packetcable.cfg
+++ b/jjb/packetcable/packetcable.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

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:

diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg
index 73510eeaa9d083d10d1bf07dbdcd5dcb0b5236e6..4cd0da21e8bf5e463a7ff261cd82fcec386d6588 100644 (file)
--- a/jjb/reservation/reservation.cfg
+++ b/jjb/reservation/reservation.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.cfg b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
index 4f2ffb5c1f94e1739fa957a450d78d573f4797f2..fc7b4263efb4a9f278e19d04ed01b8ca9a898399 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.cfg
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg
index 91ed73ee301b1e2ce29284d843009932d869bd47..e283ebb273eaebd17f981d7242e3e8d39759396a 100644 (file)
--- a/jjb/sfc/sfc.cfg
+++ b/jjb/sfc/sfc.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg
index fb1e37caf2cdd9bed100adfd3e110678c800d16f..81bc06d8cc5df5b000574f09de4a8ea50f557164 100644 (file)
--- a/jjb/snbi/snbi.cfg
+++ b/jjb/snbi/snbi.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg
index 3e7915f7fda3dd82d382c9a083742b09ccd7146b..18efd4d30e19fa9e2d4dd22c397b2577584a543b 100644 (file)
--- a/jjb/snmp/snmp.cfg
+++ b/jjb/snmp/snmp.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg
index 66edac599fabfef4f5d8fb7774600a51880c6af7..75874fdb102978743b42a793f78058c9539d9722 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.cfg
+++ b/jjb/snmp4sdn/snmp4sdn.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg
index 26163f10be20f3da3b9a089bf83bb6fbd14183f1..a36b6747380a3ee32840259f251e08db618cc179 100644 (file)
--- a/jjb/sxp/sxp.cfg
+++ b/jjb/sxp/sxp.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/tcpmd5/tcpmd5.cfg b/jjb/tcpmd5/tcpmd5.cfg
index 4ab923336cd8b68f2ee6632812df818fbe738688..1198c183233f78974dce6129075dc204aad6ec35 100644 (file)
--- a/jjb/tcpmd5/tcpmd5.cfg
+++ b/jjb/tcpmd5/tcpmd5.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg
index e01dd52e19ccdb0d2bb9d820f7f83848de923015..4cce7d7e93ecbf0c8cc7ab0f6fd4c67fb26b4d37 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.cfg
+++ b/jjb/topoprocessing/topoprocessing.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8

diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg
index 6858a4626d0aeec852dec05835b808e0e9f02e02..e4477f0032521d1f99f546af02a93fb96cd98771 100644 (file)
--- a/jjb/tsdr/tsdr.cfg
+++ b/jjb/tsdr/tsdr.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg
index 1a44f90dd41cf982d83218ea7f586bf3fb81548f..94a4e09d207367ae2716e8d2a440f3529994b03b 100644 (file)
--- a/jjb/unimgr/unimgr.cfg
+++ b/jjb/unimgr/unimgr.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: odlparent,yangtools,controller,ovsdb

diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg
index 786219c04fb7b68c31f1f895784e262f18c831c4..54f1cb5d77dda5f8d6d4b796df01dbc1a4bd9851 100644 (file)
--- a/jjb/vpnservice/vpnservice.cfg
+++ b/jjb/vpnservice/vpnservice.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg
index a81fbf2475722b04d6982d9f4b78e6266ef4f146..977ab6a0984a73a87f0c68edf5abba39c976c268 100644 (file)
--- a/jjb/vtn/vtn.cfg
+++ b/jjb/vtn/vtn.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/yang-push/yang-push.cfg b/jjb/yang-push/yang-push.cfg
index 2bdec41693cf90363d51ad1e7650192dddc1b76c..916bcc46e4653ba67e3e945036c599ccd296fd58 100644 (file)
--- a/jjb/yang-push/yang-push.cfg
+++ b/jjb/yang-push/yang-push.cfg
@@ -2,4 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 DEPENDENCIES: controller,yangtools,odlparent

diff --git a/jjb/yangtools/yangtools.cfg b/jjb/yangtools/yangtools.cfg
index a52658855cfa997d2d03e74199f32e3bad898c53..5c9f8bb2287876b2cd96be09eaff838527ed9d80 100644 (file)
--- a/jjb/yangtools/yangtools.cfg
+++ b/jjb/yangtools/yangtools.cfg
@@ -2,6 +2,7 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8