epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-20 16:45:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FGJ-4] CI tests for FabCar Java sample

Browse source 
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I2b28c69a2f3ec0e3d87252ef4a585b4a46fddcbd
This commit is contained in:
Simon Stone 2019-07-30 15:52:36 +01:00
parent 9040e28b55
commit dc8e60b4e3
3 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ci.properties
View file

@ -10,9 +10,9 @@ FAB_BINARY_REPO=fabric fabric-ca
FAB_THIRDPARTY_IMAGES_LIST=kafka zookeeper couchdb FAB_THIRDPARTY_IMAGES_LIST=kafka zookeeper couchdb
# Pull latest binaries of latest commit of release-1.4 from nexus snapshots # Pull latest binaries of latest commit of release-1.4 from nexus snapshots
# Applicable only when set IMAGE_SOURCE to "nexus" # Applicable only when set IMAGE_SOURCE to "nexus"
FAB_BINARY_VER=1.4.1-stable FAB_BINARY_VER=1.4.3-stable
# Set base version from fabric branch # Set base version from fabric branch
FAB_BASE_VERSION=1.4.1 FAB_BASE_VERSION=1.4.3
# Set base image version from fabric branch # Set base image version from fabric branch
FAB_BASEIMAGE_VERSION=0.4.15 FAB_BASEIMAGE_VERSION=0.4.15
# Set related rocketChat channel name. Default: jenkins-robot # Set related rocketChat channel name. Default: jenkins-robot

2
fabcar/java/pom.xml
View file

@ -26,7 +26,7 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.hyperledger.fabric</groupId> <groupId>org.hyperledger.fabric-gateway-java</groupId>
<artifactId>fabric-gateway-java</artifactId> <artifactId>fabric-gateway-java</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>1.4.0-SNAPSHOT</version>
</dependency> </dependency>

48
scripts/ci_scripts/fabcar.sh
View file

@ -26,7 +26,7 @@ fi
cd $WORKSPACE/$BASE_DIR/fabcar || exit cd $WORKSPACE/$BASE_DIR/fabcar || exit
export PATH=gopath/src/github.com/hyperledger/fabric-samples/bin:$PATH export PATH=gopath/src/github.com/hyperledger/fabric-samples/bin:$PATH
LANGUAGES="go javascript typescript" LANGUAGES="go java javascript typescript"
for LANGUAGE in ${LANGUAGES}; do for LANGUAGE in ${LANGUAGES}; do
echo -e "\033[1m ${LANGUAGE} Test\033[0m" echo -e "\033[1m ${LANGUAGE} Test\033[0m"
echo -e "\033[32m starting fabcar test (${LANGUAGE})" "\033[0m" echo -e "\033[32m starting fabcar test (${LANGUAGE})" "\033[0m"
@ -36,26 +36,34 @@ for LANGUAGE in ${LANGUAGES}; do
# If an application exists for this language, test it # If an application exists for this language, test it
if [ -d ${LANGUAGE} ]; then if [ -d ${LANGUAGE} ]; then
pushd ${LANGUAGE} pushd ${LANGUAGE}
if [ ${LANGUAGE} = "javascript" ]; then if [ ${LANGUAGE} = "javascript" -o ${LANGUAGE} = "typescript" ]; then
COMMAND=node if [ ${LANGUAGE} = "javascript" ]; then
PREFIX= COMMAND=node
SUFFIX=.js PREFIX=
npm install SUFFIX=.js
elif [ ${LANGUAGE} = "typescript" ]; then npm install
COMMAND=node elif [ ${LANGUAGE} = "typescript" ]; then
PREFIX=dist/ COMMAND=node
SUFFIX=.js PREFIX=dist/
npm install SUFFIX=.js
npm run build npm install
npm run build
fi
${COMMAND} ${PREFIX}enrollAdmin${SUFFIX}
copy_logs $? fabcar-${LANGUAGE}-enrollAdmin
${COMMAND} ${PREFIX}registerUser${SUFFIX}
copy_logs $? fabcar-${LANGUAGE}-registerUser
${COMMAND} ${PREFIX}query${SUFFIX}
copy_logs $? fabcar-${LANGUAGE}-query
${COMMAND} ${PREFIX}invoke${SUFFIX}
copy_logs $? fabcar-${LANGUAGE}-invoke
elif [ ${LANGUAGE} = "java" ]; then
mvn test
copy_logs $? fabcar-${LANGUAGE}
else
echo -e "\033[31m do not know how to handle ${LANGUAGE}" "\033[0m"
exit 1
fi fi
${COMMAND} ${PREFIX}enrollAdmin${SUFFIX}
copy_logs $? fabcar-${LANGUAGE}-enrollAdmin
${COMMAND} ${PREFIX}registerUser${SUFFIX}
copy_logs $? fabcar-${LANGUAGE}-registerUser
${COMMAND} ${PREFIX}query${SUFFIX}
copy_logs $? fabcar-${LANGUAGE}-query
${COMMAND} ${PREFIX}invoke${SUFFIX}
copy_logs $? fabcar-${LANGUAGE}-invoke
popd popd
fi fi
docker ps -aq | xargs docker rm -f docker ps -aq | xargs docker rm -f