From d45bf86fd3750286db225030c87604929955d8c4 Mon Sep 17 00:00:00 2001 From: Troy Ronda Date: Fri, 24 Aug 2018 10:46:45 -0400 Subject: [PATCH] [FABG-743] Update prev to Fabric 1.1.1 Change-Id: Icec4614b5cda495aba71eb19009157d2c37fa79d Signed-off-by: Troy Ronda --- test/fixtures/dockerenv/prev-env.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/fixtures/dockerenv/prev-env.sh b/test/fixtures/dockerenv/prev-env.sh index e14c09d55c..8f08db129d 100644 --- a/test/fixtures/dockerenv/prev-env.sh +++ b/test/fixtures/dockerenv/prev-env.sh @@ -7,13 +7,18 @@ # This file contains environment overrides to enable testing # against the latest pre-release target. + +# Temporarily override FABRIC-ARCH until latest prev follows new naming conventions. +export FABRIC_ARCH="" +export FABRIC_ARCH_SEP="" + export FABRIC_FIXTURE_VERSION="v1.1" export FABRIC_CRYPTOCONFIG_VERSION="v1" -export FABRIC_CA_FIXTURE_TAG="1.1.0" -export FABRIC_ORDERER_FIXTURE_TAG="1.1.0" -export FABRIC_PEER_FIXTURE_TAG="1.1.0" -export FABRIC_BUILDER_FIXTURE_TAG="1.1.0" +export FABRIC_CA_FIXTURE_TAG="${ARCH}-1.1.0" +export FABRIC_ORDERER_FIXTURE_TAG="${ARCH}-1.1.1" +export FABRIC_PEER_FIXTURE_TAG="${ARCH}-1.1.1" +export FABRIC_BUILDER_FIXTURE_TAG="${ARCH}-1.1.1" # override configuration that loads crypto-config export FABRIC_SDK_CLIENT_CRYPTOCONFIG_PATH='${GOPATH}'"/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config"