Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Run maven in non-interactive mode.
[ci-management.git]
/
jjb
/
vpp
/
include-raw-vpp-build.sh
diff --git
a/jjb/vpp/include-raw-vpp-build.sh
b/jjb/vpp/include-raw-vpp-build.sh
index
b51b41a
..
6a13995
100644
(file)
--- 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
#!/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
# do nothing but print the current slave hostname
hostname
export CCACHE_DIR=/tmp/ccache
@@
-39,7
+46,9
@@
then
echo "Building using \"make verify\""
[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
else
echo "Building using \"make verify\""
[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify
else
- echo "Building using \"build-root/vagrant/build.sh\""
+ echo "Building using \"make build-root/vagrant/build.sh\""
+ [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes install-dep
+ [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev
[ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
fi
[ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh
fi