From: Marco Varlese Date: Tue, 28 Nov 2017 14:23:27 +0000 (+0100) Subject: Remove no-longer required branch X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=cd1b47430ac329b2dc4ccf221353b1cac14280f9;p=ci-management.git Remove no-longer required branch With the support to create RPMs added for openSUSE the branch to execute different build commands is no longer required. It makes maintainance much simpler too. Change-Id: Ia280f026535f523c6866652e623941e46e572fd6 Signed-off-by: Marco Varlese --- diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index 4ddcc84e0..28d69190e 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -43,23 +43,13 @@ 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 - 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 + echo "Building using \"make verify\"" + [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify else - 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 + 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 if [ "x${VPP_REPO}" == "x1" ]; then