Fix csit branch for perf timed jobs

[ci-management.git] / jjb / sweetcomb / include-raw-sweetcomb-build.sh

diff --git a/jjb/sweetcomb/include-raw-sweetcomb-build.sh b/jjb/sweetcomb/include-raw-sweetcomb-build.sh
index ac743d8..639d7fd 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')
 
@@ -19,12 +22,20 @@ function setup {
                 echo "Deleting: /etc/apt/sources.list.d/99fd.io.list"
                 sudo rm /etc/apt/sources.list.d/99fd.io.list
             fi
+            if [ -f /etc/apt/sources.list.d/fdio_master.list ];then
+                echo "Deleting: /etc/apt/sources.list.d/fdio_master.list"
+                sudo rm /etc/apt/sources.list.d/fdio_master.list
+            fi
             curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash
         elif [ "$OS_ID" == "centos" ]; then
             if [ -f /etc/yum.repos.d/fdio-master.repo ]; then
                 echo "Deleting: /etc/yum.repos.d/fdio-master.repo"
                 sudo rm /etc/yum.repos.d/fdio-master.repo
             fi
+            if [ -f /etc/yum.repos.d/fdio_master.repo ]; then
+                echo "Deleting: /etc/yum.repos.d/fdio_master.repo"
+                sudo rm /etc/yum.repos.d/fdio_master.repo
+            fi
             curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash
         fi
     fi
@@ -36,8 +47,7 @@ echo "Building using \"make build-root/build.sh\""
 [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep
 [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep-extra
 [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-vpp
-[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes build-scvpp
-[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes build
+[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes build-package
 
 echo "*******************************************************************"
 echo "* SWEETCOMB BUILD SUCCESSFULLY COMPLETED"