diff options
| author |   Marco Varlese <marco.varlese@suse.com> | 2017-11-28 15:23:27 +0100 |
|---|---|---|
| committer | Marco Varlese <marco.varlese@suse.com> | 2017-11-29 13:42:37 +0100 |
| commit | cd1b47430ac329b2dc4ccf221353b1cac14280f9 (patch) | |
| tree | 16785547647e59aea3303e09f1819e0b977217df /jjb/vpp/include-raw-vpp-build.sh | |
| parent | 1ba58b1ecdb36465c90972d9b1e8472c1846ac0e (diff) | |
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 <marco.varlese@suse.com>
Diffstat (limited to 'jjb/vpp/include-raw-vpp-build.sh')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 22 |
1 files changed, 6 insertions, 16 deletions
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 |