summaryrefslogtreecommitdiffstats
path: root/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh')
-rw-r--r--jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh21
1 files changed, 18 insertions, 3 deletions
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
index bdc475df2..99a911c65 100644
--- a/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-pkg-push.sh
@@ -10,7 +10,8 @@ set -x
if [ "${STREAM}" == "master" ]; then
if [ "${OS}" == "centos7" ]; then
# Determine VPP Java API version used in maven build
- VERSION=`yum list installed vpp-api-java | grep vpp-api-java | awk '{ printf $2; }'`
+ JVPP_VERSION=`yum list installed vpp-api-java | grep vpp-api-java | awk '{ printf $2; }'`
+ VERSION=`yum deplist vpp-api-java |grep vpp-lib |head -1 | awk '{ print $3}'`
# Write a file that will echo VPP dependencies
echo -n 'echo' > vpp_dependencies
@@ -21,11 +22,12 @@ if [ "${STREAM}" == "master" ]; then
mv vpp_dependencies packaging/rpm/
else
# Determine VPP Java API version used in maven build
- VERSION=`apt list --installed | grep vpp-api-java | awk '{ printf $2; }'`
+ JVPP_VERSION=`apt list --installed | grep vpp-api-java | awk '{ printf $2; }'`
+ VERSION=`apt-cache showpkg vpp-api-java |grep "$JVPP_VERSION" |grep vpp | sed "s/.*(. //" | sed "s/).*//"`
# Write a file that will echo VPP dependencies
echo -n 'echo' > vpp_dependencies
- echo " \"vpp (= ${VERSION}), vpp-plugins (= ${VERSION})\"" >> vpp_dependencies
+ echo " \"vpp (= ${VERSION}), vpp-plugin-core (= ${VERSION})\"" >> vpp_dependencies
chmod +x vpp_dependencies
# Overwrite default dependencies file
@@ -62,4 +64,17 @@ elif [ "${OS}" == "ubuntu1604" ]; then
do
push_deb "$i"
done
+elif [ "${OS}" == "ubuntu1804" ]; then
+
+ # Build the debs
+ ./packaging/deb/bionic/debuild.sh
+
+ # Find the files
+ DEBS=$(find . -type f -iname '*.deb')
+
+ # Publish hc2vpp packages
+ for i in $DEBS
+ do
+ push_deb "$i"
+ done
fi