Skip to content

Commit

Permalink
[FAB-7932] Version test failure for release
Browse files Browse the repository at this point in the history
This fixes a bad test case which only fails when IS_RELEASE is true.

Change-Id: I2112bfe7c93e5e436c41ff51788b173477d98aed
Signed-off-by: Keith Smith <bksmith@us.ibm.com>
  • Loading branch information
Keith Smith committed Jan 26, 2018
1 parent 437d27e commit e33ebdf
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion scripts/fvt/version_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ function checkVersion() {

base_version=$(awk '/^[:blank:]*BASE_VERSION/ {print $NF}' Makefile)
extra_version="snapshot-$(git rev-parse --short HEAD)"
project_version=${base_version}-${extra_version}
if [ "$IS_RELEASE" = "true" ]; then
project_version=${base_version}
else
project_version=${base_version}-${extra_version}
fi
echo "Project version is: $project_version"

trap "CleanUp 1; exit 1" INT
$FABRIC_CA_SERVEREXEC version | checkVersion "$project_version" || let RC+=1
Expand Down

0 comments on commit e33ebdf

Please sign in to comment.