diff options
Diffstat (limited to 'jjb/scripts/vpp')
-rw-r--r-- | jjb/scripts/vpp/arm-build-no-test.sh | 64 | ||||
-rw-r--r-- | jjb/scripts/vpp/arm-build.sh | 78 | ||||
-rw-r--r-- | jjb/scripts/vpp/build.sh | 16 |
3 files changed, 14 insertions, 144 deletions
diff --git a/jjb/scripts/vpp/arm-build-no-test.sh b/jjb/scripts/vpp/arm-build-no-test.sh deleted file mode 100644 index ae5aa34d..00000000 --- a/jjb/scripts/vpp/arm-build-no-test.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -# This script wants environment variables -# set by parallel-vars.sh script. -# Otherwise "make test" is not parallelized, -# possibly leading to jobs overstepping their time limit. - -# basic build script example -set -xe -o pipefail - -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') - -echo OS_ID: $OS_ID -echo OS_VERSION_ID: $OS_VERSION_ID - -# do nothing but print the current slave hostname -hostname -export CCACHE_DIR=/tmp/ccache -if [ -d $CCACHE_DIR ];then - echo $CCACHE_DIR exists - du -sk $CCACHE_DIR -else - echo $CCACHE_DIR does not exist. This must be a new slave. -fi - -echo "cat /etc/bootstrap.sha" -if [ -f /etc/bootstrap.sha ];then - cat /etc/bootstrap.sha -else - echo "Cannot find cat /etc/bootstrap.sha" -fi - -echo "cat /etc/bootstrap-functions.sha" -if [ -f /etc/bootstrap-functions.sha ];then - cat /etc/bootstrap-functions.sha -else - echo "Cannot find cat /etc/bootstrap-functions.sha" -fi - -echo "sha1sum of this script: ${0}" -sha1sum $0 - -echo "CC=${CC}" - -make UNATTENDED=yes install-dep -make UNATTENDED=yes dpdk-install-dev -make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages -make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install -make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp libmemif-install -make UNATTENDED=yes pkg-deb - -if [ "x${VPP_REPO}" == "x1" ]; then - if [ "x${REBASE_NEEDED}" == "x1" ]; then - echo "This patch to vpp is based on an old point in the tree that is likely" - echo "to fail verify." - echo "PLEASE REBASE PATCH ON THE CURRENT HEAD OF THE VPP REPO" - exit 1 - fi -fi - -echo "*******************************************************************" -echo "* VPP ARM BUILD SUCCESSFULLY COMPLETED" -echo "*******************************************************************" diff --git a/jjb/scripts/vpp/arm-build.sh b/jjb/scripts/vpp/arm-build.sh deleted file mode 100644 index 798e90e9..00000000 --- a/jjb/scripts/vpp/arm-build.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -# This script wants environment variables -# set by parallel-vars.sh script. -# Otherwise "make test" is not parallelized, -# possibly leading to jobs overstepping their time limit. - -# basic build script example -set -xe -o pipefail - -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') - -echo OS_ID: $OS_ID -echo OS_VERSION_ID: $OS_VERSION_ID - -# do nothing but print the current slave hostname -hostname -export CCACHE_DIR=/tmp/ccache -if [ -d $CCACHE_DIR ];then - echo $CCACHE_DIR exists - du -sk $CCACHE_DIR -else - echo $CCACHE_DIR does not exist. This must be a new slave. -fi - -echo "cat /etc/bootstrap.sha" -if [ -f /etc/bootstrap.sha ];then - cat /etc/bootstrap.sha -else - echo "Cannot find cat /etc/bootstrap.sha" -fi - -echo "cat /etc/bootstrap-functions.sha" -if [ -f /etc/bootstrap-functions.sha ];then - cat /etc/bootstrap-functions.sha -else - echo "Cannot find cat /etc/bootstrap-functions.sha" -fi - -echo "sha1sum of this script: ${0}" -sha1sum $0 - -echo "CC=${CC}" -echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}" -# If and only if we are doing verify *after* make verify was made to work -# and we are not a CSIT job just building packages, then use make verify, -# else use the old build-root/vagrant/build.sh -if [ "x${MAKE_PARALLEL_JOBS}" != "x" ] -then - echo "Building with MAKE_PARALLEL_JOBS=${MAKE_PARALLEL_JOBS}" - TEST_JOBS="TEST_JOBS=${MAKE_PARALLEL_JOBS}" -fi - -if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \ - [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ] -then - echo "Building using \"make verify\"" - [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes SKIP_AARCH64=yes ${TEST_JOBS} verify -else - echo "Building using \"make build-root/vagrant/build.sh\"" - [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep - [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev - [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh -fi - -if [ "x${VPP_REPO}" == "x1" ]; then - if [ "x${REBASE_NEEDED}" == "x1" ]; then - echo "This patch to vpp is based on an old point in the tree that is likely" - echo "to fail verify." - echo "PLEASE REBASE PATCH ON THE CURRENT HEAD OF THE VPP REPO" - exit 1 - fi -fi - -echo "*******************************************************************" -echo "* VPP ARM BUILD SUCCESSFULLY COMPLETED" -echo "*******************************************************************" diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh index 9fd989fd..c6ab0d65 100644 --- a/jjb/scripts/vpp/build.sh +++ b/jjb/scripts/vpp/build.sh @@ -43,13 +43,23 @@ echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}" if [ "x${MAKE_PARALLEL_JOBS}" != "x" ] then echo "Building with MAKE_PARALLEL_JOBS=${MAKE_PARALLEL_JOBS}" + export TEST_JOBS="${MAKE_PARALLEL_JOBS}" +else + export TEST_JOBS="auto" +fi + +if [ "x${MAKE_PARALLEL_FLAGS}" != "x" ] +then + echo "Building with MAKE_PARALLEL_FLAGS=${MAKE_PARALLEL_FLAGS}" fi +echo "Building with TEST_JOBS=${TEST_JOBS}" + if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \ [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ] then echo "Building using \"make verify\"" - [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes TEST_JOBS=auto verify + [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify else echo "Building using \"make pkg-verify\"" [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes pkg-verify @@ -64,6 +74,8 @@ if [ "x${VPP_REPO}" == "x1" ]; then fi fi +local_arch=$(uname -m) + echo "*******************************************************************" -echo "* VPP BUILD SUCCESSFULLY COMPLETED" +echo "* VPP ${local_arch^^} BUILD SUCCESSFULLY COMPLETED" echo "*******************************************************************" |