mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-22 09:35:10 +00:00
Minor fixes and improvements to test-network-k8s (#849)
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com> Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
This commit is contained in:
parent
63cc77bdc3
commit
49749c6584
4 changed files with 7 additions and 6 deletions
|
|
@ -148,7 +148,7 @@ $ ./network chaincode query asset-transfer-basic '{"Args":["ReadAsset","1"]}' |
|
||||||
|
|
||||||
### Describe
|
### Describe
|
||||||
```shell
|
```shell
|
||||||
$ ./network chaincode metadata asset-transfer-basic | jq | head
|
$ ./network chaincode metadata asset-transfer-basic | awk "NR==3,NR==3 {print}" | jq | head
|
||||||
{
|
{
|
||||||
"info": {
|
"info": {
|
||||||
"title": "undefined",
|
"title": "undefined",
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,7 @@ make docker # in hyperledger/fabric
|
||||||
|
|
||||||
export TEST_NETWORK_FABRIC_VERSION=2.4.0
|
export TEST_NETWORK_FABRIC_VERSION=2.4.0
|
||||||
|
|
||||||
./network load-images
|
./network cluster load-images
|
||||||
./network up
|
./network up
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,7 @@ function cluster_init() {
|
||||||
|
|
||||||
if [ "${STAGE_DOCKER_IMAGES}" == true ]; then
|
if [ "${STAGE_DOCKER_IMAGES}" == true ]; then
|
||||||
pull_docker_images
|
pull_docker_images
|
||||||
load_docker_images
|
kind_load_docker_images
|
||||||
pull_docker_images_for_rest_sample
|
|
||||||
load_docker_images_for_rest_sample
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,10 @@ function apply_k8s_builders() {
|
||||||
push_fn "Installing k8s chaincode builders"
|
push_fn "Installing k8s chaincode builders"
|
||||||
|
|
||||||
apply_template kube/org1/org1-install-k8s-builder.yaml $ORG1_NS
|
apply_template kube/org1/org1-install-k8s-builder.yaml $ORG1_NS
|
||||||
apply_template kube/org2/org2-install-k8s-builder.yaml $ORG1_NS
|
apply_template kube/org2/org2-install-k8s-builder.yaml $ORG2_NS
|
||||||
|
|
||||||
|
kubectl -n $ORG1_NS wait --for=condition=complete --timeout=60s job/org1-install-k8s-builder
|
||||||
|
kubectl -n $ORG2_NS wait --for=condition=complete --timeout=60s job/org2-install-k8s-builder
|
||||||
|
|
||||||
pop_fn
|
pop_fn
|
||||||
}
|
}
|
||||||
Loading…
Reference in a new issue