epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-23 01:55:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Run basic-asset transfer CI tests with Java + golang CC in Azure

Browse source 
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
This commit is contained in:
Josh Kneubuhl 2022-04-05 10:40:52 -04:00
parent a02b945faf
commit bef68f326a
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ci/azure-pipelines.yml
View file

@ -135,8 +135,12 @@ jobs:
vmImage: ubuntu-20.04 vmImage: ubuntu-20.04
strategy: strategy:
matrix: matrix:
Typescript: Typescript-Java:
CLIENT_LANGUAGE: typescript CLIENT_LANGUAGE: typescript
CHAINCODE_LANGUAGE: java
Typescript-Golang:
CLIENT_LANGUAGE: typescript
CHAINCODE_LANGUAGE: external
steps: steps:
- template: templates/install-k8s-deps.yml - template: templates/install-k8s-deps.yml
- script: ../ci/scripts/run-k8s-test-network-basic.sh - script: ../ci/scripts/run-k8s-test-network-basic.sh

5
ci/scripts/run-k8s-test-network-basic.sh
View file

@ -9,6 +9,7 @@ set -euo pipefail
# Test matrix parameters # Test matrix parameters
export CONTAINER_CLI=${CONTAINER_CLI:-docker} export CONTAINER_CLI=${CONTAINER_CLI:-docker}
export CLIENT_LANGUAGE=${CLIENT_LANGUAGE:-typescript} export CLIENT_LANGUAGE=${CLIENT_LANGUAGE:-typescript}
export CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-java}
# Fabric version and Docker registry source: use the latest stable tag image from JFrog # Fabric version and Docker registry source: use the latest stable tag image from JFrog
export FABRIC_VERSION=${FABRIC_VERSION:-2.4} export FABRIC_VERSION=${FABRIC_VERSION:-2.4}
@ -22,8 +23,8 @@ export TEST_NETWORK_KIND_CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind}
# asset-transfer-basic chaincode target # asset-transfer-basic chaincode target
export TEST_NETWORK_CHAINCODE_NAME=${TEST_NETWORK_CHAINCODE_NAME:-asset-transfer-basic} export TEST_NETWORK_CHAINCODE_NAME=${TEST_NETWORK_CHAINCODE_NAME:-asset-transfer-basic}
export TEST_NETWORK_CHAINCODE_PATH=${TEST_NETWORK_CHAINCODE_PATH:-$PWD/../asset-transfer-basic/chaincode-java} export TEST_NETWORK_CHAINCODE_PATH=${TEST_NETWORK_CHAINCODE_PATH:-$PWD/../asset-transfer-basic/chaincode-${CHAINCODE_LANGUAGE}}
export TEST_NETWORK_CHAINCODE_IMAGE=${TEST_NETWORK_CHAINCODE_IMAGE:-fabric-samples/asset-transfer-basic/chaincode-java} export TEST_NETWORK_CHAINCODE_IMAGE=${TEST_NETWORK_CHAINCODE_IMAGE:-fabric-samples/asset-transfer-basic/chaincode-${CHAINCODE_LANGUAGE}}
# gateway client application parameters # gateway client application parameters
export GATEWAY_CLIENT_APPLICATION_PATH=${GATEWAY_CLIENT_APPLICATION_PATH:-../asset-transfer-basic/application-gateway-${CLIENT_LANGUAGE}} export GATEWAY_CLIENT_APPLICATION_PATH=${GATEWAY_CLIENT_APPLICATION_PATH:-../asset-transfer-basic/application-gateway-${CLIENT_LANGUAGE}}

4
test-network-k8s/kube/org1/org1-cc-template.yaml
View file

@ -25,8 +25,8 @@ spec:
env: env:
- name: CHAINCODE_SERVER_ADDRESS - name: CHAINCODE_SERVER_ADDRESS
value: 0.0.0.0:9999 value: 0.0.0.0:9999
- name: CHAINCODE_ID
# todo: load with an envFrom and a dynamic config map with the ID. value: {{CHAINCODE_ID}}
- name: CORE_CHAINCODE_ID_NAME - name: CORE_CHAINCODE_ID_NAME
value: {{CHAINCODE_ID}} value: {{CHAINCODE_ID}}
ports: ports: