diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-01-10 08:08:27 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-01-10 07:20:07 +0000 |
| commit | ff3c67b1c1f5bf5c2cdd45945c5626d7f72bd9de (patch) | |
| tree | 2876134de295d79d5d5200a719c32fbdc1d2eaa1 | |
| parent | a31bc791c7dca9ab9f74691fb8774f36be17764e (diff) | |
Move jvpp_version file to jvpp dir 1/2stable/1710
Change-Id: I1d7132152561cd8417632ccc16942e2b527f9aa4
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
(cherry picked from commit 51a13d8012c56d887855b463f447f1fd618d4361)
| -rwxr-xr-x | jvpp/install_from_package.sh | 2 | ||||
| -rwxr-xr-x | jvpp/install_from_vpp_build_dir.sh | 2 | ||||
| -rwxr-xr-x | jvpp/version | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/jvpp/install_from_package.sh b/jvpp/install_from_package.sh index f196f3ab0..27ab0c8c6 100755 --- a/jvpp/install_from_package.sh +++ b/jvpp/install_from_package.sh @@ -16,7 +16,7 @@ JARS=$(find "$JAR_DIR" -type f -iname 'jvpp-*.jar') echo "Found:" echo "$JARS" -JVPP_VERSION=`$DIR_NAME/../jvpp-version` +JVPP_VERSION=`$DIR_NAME/version` echo "Target jvpp version: $JVPP_VERSION" for i in ${JARS} diff --git a/jvpp/install_from_vpp_build_dir.sh b/jvpp/install_from_vpp_build_dir.sh index 06c1b1bff..ca115b0f7 100755 --- a/jvpp/install_from_vpp_build_dir.sh +++ b/jvpp/install_from_vpp_build_dir.sh @@ -17,7 +17,7 @@ JARS="$(find "$VPP_DIR/build-root/install-vpp-native/vpp/share/java/" -type f -i echo "Found:" echo "$JARS" -JVPP_VERSION=`$DIR_NAME/../jvpp-version` +JVPP_VERSION=`$DIR_NAME/version` echo "Target jvpp version: $JVPP_VERSION" for i in ${JARS} diff --git a/jvpp/version b/jvpp/version new file mode 100755 index 000000000..b2482d7e2 --- /dev/null +++ b/jvpp/version @@ -0,0 +1,8 @@ +#!/bin/sh +# +# Defines jvpp version used by hc2vpp-integration job +# which produces honeycomb DEB and RPM artifacts. +# +# Version should match the one used in pom files. +# +echo 18.01-SNAPSHOT |