diff --git a/ci.properties b/ci.properties index a1fbb1c2..f6788b42 100644 --- a/ci.properties +++ b/ci.properties @@ -10,9 +10,9 @@ FAB_BINARY_REPO=fabric fabric-ca FAB_THIRDPARTY_IMAGES_LIST=kafka zookeeper couchdb # Pull latest binaries of latest commit of release-1.4 from nexus snapshots # 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 -FAB_BASE_VERSION=1.4.1 +FAB_BASE_VERSION=1.4.3 # Set base image version from fabric branch FAB_BASEIMAGE_VERSION=0.4.15 # Set related rocketChat channel name. Default: jenkins-robot diff --git a/fabcar/java/pom.xml b/fabcar/java/pom.xml index db663c5d..37733b1b 100644 --- a/fabcar/java/pom.xml +++ b/fabcar/java/pom.xml @@ -26,7 +26,7 @@ - org.hyperledger.fabric + org.hyperledger.fabric-gateway-java fabric-gateway-java 1.4.0-SNAPSHOT diff --git a/scripts/ci_scripts/fabcar.sh b/scripts/ci_scripts/fabcar.sh index 2c8ad2ab..9d1a5f0f 100755 --- a/scripts/ci_scripts/fabcar.sh +++ b/scripts/ci_scripts/fabcar.sh @@ -26,7 +26,7 @@ fi cd $WORKSPACE/$BASE_DIR/fabcar || exit 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 echo -e "\033[1m ${LANGUAGE} Test\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 [ -d ${LANGUAGE} ]; then pushd ${LANGUAGE} - if [ ${LANGUAGE} = "javascript" ]; then - COMMAND=node - PREFIX= - SUFFIX=.js - npm install - elif [ ${LANGUAGE} = "typescript" ]; then - COMMAND=node - PREFIX=dist/ - SUFFIX=.js - npm install - npm run build + if [ ${LANGUAGE} = "javascript" -o ${LANGUAGE} = "typescript" ]; then + if [ ${LANGUAGE} = "javascript" ]; then + COMMAND=node + PREFIX= + SUFFIX=.js + npm install + elif [ ${LANGUAGE} = "typescript" ]; then + COMMAND=node + PREFIX=dist/ + SUFFIX=.js + 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 - ${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 fi docker ps -aq | xargs docker rm -f