diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 759d36a3..bd9c3d9c 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -99,11 +99,15 @@ jobs: Ledger-Chaincode-Go: DIRECTORY: asset-transfer-ledger-queries LANGUAGE: go - TYPE: chaincode - Private-Chaincode-Go: + TYPE: chaincode + PrivateData-Chaincode-Go: DIRECTORY: asset-transfer-private-data LANGUAGE: go TYPE: chaincode + PrivateData-Application-Javascript: + DIRECTORY: asset-transfer-private-data + LANGUAGE: javascript + TYPE: application Secured-Chaincode-Go: DIRECTORY: asset-transfer-secured-agreement LANGUAGE: go diff --git a/ci/scripts/run-test-network-private.sh b/ci/scripts/run-test-network-private.sh index c2578c40..c38cf978 100755 --- a/ci/scripts/run-test-network-private.sh +++ b/ci/scripts/run-test-network-private.sh @@ -14,8 +14,16 @@ function print() { print "Creating network" ./network.sh up createChannel -ca -s couchdb -i "${FABRIC_VERSION}" -print "Deploying ${CHAINCODE_NAME} chaincode" -./network.sh deployCC -ccn "${CHAINCODE_NAME}" -ccv 1 -ccs 1 -ccl "${CHAINCODE_LANGUAGE}" +print "Deploying private-data ${CHAINCODE_NAME} chaincode" +./network.sh deployCC -ccn "${CHAINCODE_NAME}" -ccv 1 -ccs 1 -ccl "${CHAINCODE_LANGUAGE}" -ccep "OR('Org1MSP.peer','Org2MSP.peer')" -cccg ../asset-transfer-private-data/chaincode-go/collections_config.json + +# Run Javascript application +print "Initializing Javascript application" +pushd ../asset-transfer-private-data/application-javascript +npm install +print "Executing app.js" +node app.js +popd print "Stopping network" ./network.sh down