summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vpp')
-rw-r--r--jjb/vpp/include-raw-vpp-build.sh29
-rw-r--r--jjb/vpp/include-raw-vpp-checkstyle.sh2
2 files changed, 24 insertions, 7 deletions
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index 5bcd35734..4ddcc84e0 100644
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -1,6 +1,13 @@
#!/bin/bash
# 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
@@ -36,13 +43,23 @@ echo "IS_CSIT_VPP_JOB=${IS_CSIT_VPP_JOB}"
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 verify
+ if [ "$OS_ID" == "opensuse" ]; then
+ echo "Building for openSUSE"
+ [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+ else
+ echo "Building using \"make verify\""
+ [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
+ fi
else
- echo "Building using \"make build-root/vagrant/build.sh\""
- [ "x${DRYRUN}" == "xTrue" ] || make install-dep
- [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
- [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+ if [ "$OS_ID" == "opensuse" ]; then
+ echo "Building for openSUSE"
+ [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+ else
+ echo "Building using \"make build-root/vagrant/build.sh\""
+ [ "x${DRYRUN}" == "xTrue" ] || make install-dep
+ [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
+ [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
+ fi
fi
if [ "x${VPP_REPO}" == "x1" ]; then
diff --git a/jjb/vpp/include-raw-vpp-checkstyle.sh b/jjb/vpp/include-raw-vpp-checkstyle.sh
index 593fb777e..258c9e7e2 100644
--- a/jjb/vpp/include-raw-vpp-checkstyle.sh
+++ b/jjb/vpp/include-raw-vpp-checkstyle.sh
@@ -4,4 +4,4 @@ if [ -f build-root/scripts/checkstyle.sh ];then
build-root/scripts/checkstyle.sh
else
echo "Cannot find cat build-root/scripts/checkstyle.sh - skipping checkstyle"
-fi \ No newline at end of file
+fi