diff options
| author |   Marco Varlese <marco.varlese@suse.com> | 2017-10-13 10:18:25 +0200 |
|---|---|---|
| committer |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-11-01 11:14:02 -0500 |
| commit | a36386373cd8d08103492dd25fe59b564653b929 (patch) | |
| tree | 20518505dabd2bb86e350b57e3fa99918acde3c1 /jjb/vpp | |
| parent | f0be775cdefaeb6887f136f82b8b9292cc153b8b (diff) | |
openSUSE support and some rework to identify OS
Rework to identify OS:
Same approach followed by Makefiles and building scripts in the VPP
repository. It is much cleaner and easier to simply use the environment
variables in /etc/os-release
openSUSE support:
Some of the code added to the scripts can be removed once a separate
patch from Vanessa is merged. The purpose here is to save the changes
made since they will be lost otherwise.
Change-Id: I06a041bbc5f5b7e3fa3510db43acf7d1462ec24c
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jjb/vpp')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 29 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-checkstyle.sh | 2 |
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 |