Merge "fix jar deploy for jvpp merge jobs"

diff --git a/jjb/scripts/packagecloud_push.sh b/jjb/scripts/packagecloud_push.sh
index c37ac55..95ea92e 100644 (file)
--- a/jjb/scripts/packagecloud_push.sh
+++ b/jjb/scripts/packagecloud_push.sh
@@ -29,8 +29,11 @@ if [ -f ~/.packagecloud ]; then
       openSUSE)
         # Use /etc/os-release on openSUSE to get $VERSION
         . /etc/os-release
-        RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm')
+        RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep -v 'vpp-ext-deps')
+        VPP_EXT_RPMS=$(find . -type f -iregex '.*/.*\.\(s\)?rpm' | grep 'vpp-ext-deps')
         package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${VERSION}/" ${RPMS}
+        # This file may have already been uploaded. Don't error out if it exists.
+        package_cloud push "${PCIO_CO}/${STREAM}/opensuse/${VERSION}/" ${VPP_EXT_RPMS} --skip-errors
       ;;
     esac
 fi

diff --git a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
index 4121d18..3c75757 100644 (file)
--- a/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
+++ b/jjb/scripts/setup_vpp_ubuntu_docker_test.sh
@@ -12,7 +12,10 @@ set -e -o pipefail
 OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 if ! [ -z ${DOCKER_TEST} ] ; then
-               sudo mount -o remount /dev/shm -o size=512M || true
+        # for 4 cores:
+        # framework.VppTestCase.MIN_REQ_SHM + (num_cores * framework.VppTestCase.SHM_PER_PROCESS)
+        # 1073741824 == 1024M (1073741824 >> 20)
+               sudo mount -o remount /dev/shm -o size=1024M || true
         echo "/dev/shm remounted"
 fi
 

diff --git a/jjb/sweetcomb/include-raw-sweetcomb-build.sh b/jjb/sweetcomb/include-raw-sweetcomb-build.sh
index 8f12a9d..b03b0ef 100644 (file)
--- a/jjb/sweetcomb/include-raw-sweetcomb-build.sh
+++ b/jjb/sweetcomb/include-raw-sweetcomb-build.sh
@@ -2,6 +2,9 @@
 # basic build script example
 set -xe -o pipefail
 
+##container server node detection
+grep search /etc/resolv.conf  || true
+
 OS_ID=$(grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')