From d8aec47e05a3c8155a142eab7fa3c64c02fffb51 Mon Sep 17 00:00:00 2001 From: Josh Kneubuhl Date: Fri, 8 Jul 2022 09:01:29 -0400 Subject: [PATCH] Run k8s sample network tests against latest MAJOR.MINOR release of fabric, CA docker hub images. Signed-off-by: Josh Kneubuhl --- ci/scripts/run-k8s-test-network-basic.sh | 6 ------ test-network-k8s/network | 4 ++-- test-network-k8s/scripts/prereqs.sh | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ci/scripts/run-k8s-test-network-basic.sh b/ci/scripts/run-k8s-test-network-basic.sh index af87a8a8..2f6de991 100755 --- a/ci/scripts/run-k8s-test-network-basic.sh +++ b/ci/scripts/run-k8s-test-network-basic.sh @@ -12,12 +12,6 @@ export CLIENT_LANGUAGE=${CLIENT_LANGUAGE:-typescript} export CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-java} export TEST_NETWORK_CHAINCODE_BUILDER=${CHAINCODE_BUILDER:-ccaas} -# Fabric version and Docker registry source: use the latest stable tag image from JFrog -export FABRIC_VERSION=${FABRIC_VERSION:-2.4} -export TEST_NETWORK_FABRIC_CONTAINER_REGISTRY=hyperledger-fabric.jfrog.io -export TEST_NETWORK_FABRIC_VERSION=amd64-${FABRIC_VERSION}-stable -export TEST_NETWORK_FABRIC_CA_VERSION=amd64-${FABRIC_VERSION}-stable - # test-network-k8s parameters export TEST_TAG=$(git describe) export TEST_NETWORK_KIND_CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind} diff --git a/test-network-k8s/network b/test-network-k8s/network index 2de8bb6c..6fc280e9 100755 --- a/test-network-k8s/network +++ b/test-network-k8s/network @@ -28,8 +28,8 @@ function context() { export ${name}="${!override_name:-${default_value}}" } -context FABRIC_VERSION 2.4.4 -context FABRIC_CA_VERSION 1.5.5 +context FABRIC_VERSION 2.4 +context FABRIC_CA_VERSION 1.5 context CLUSTER_RUNTIME kind # or k3s for Rancher context CONTAINER_CLI docker # or nerdctl for containerd diff --git a/test-network-k8s/scripts/prereqs.sh b/test-network-k8s/scripts/prereqs.sh index 31412c90..7e7c2a3e 100755 --- a/test-network-k8s/scripts/prereqs.sh +++ b/test-network-k8s/scripts/prereqs.sh @@ -47,7 +47,7 @@ function check_prereqs() { if [[ $? -ne 0 ]]; then echo "Downloading LATEST Fabric binaries and config" curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/bootstrap.sh \ - | bash -s -- $FABRIC_VERSION $FABRIC_CA_VERSION -s -d + | bash -s -- -s -d # remove sample config files extracted by the installation script rm config/configtx.yaml