Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 427c329

Browse files
troyrondatroyronda
committed
[FABG-739] Use 1.2.1 images from dev registry
This change temporarily uses the 1.2.1 images from the dev registry to stablize tests. Change-Id: If40d3daa9999363b83ecf2d7a8e199b4ff736968 Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent 63f1c2b commit 427c329

File tree

2 files changed

+44
-14
lines changed

2 files changed

+44
-14
lines changed

‎Makefile‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,15 @@ unit-tests-pkcs11: clean-tests depend-noforce populate-noforce license
287287

288288
.PHONY: integration-tests-stable
289289
integration-tests-stable: clean-tests depend-noforce populate-noforce
290-
@. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
290+
@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
291+
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
292+
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
291293
cd $(FIXTURE_DOCKERENV_PATH) && \
292-
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
294+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
295+
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
293296
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
294297
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-nopkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
295-
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
298+
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-nopkcs11-test.yaml"
296299

297300
.PHONY: integration-tests-prev
298301
integration-tests-prev: clean-tests depend-noforce populate-noforce populate-fixtures-prev-noforce
@@ -328,22 +331,28 @@ integration-tests-devstable: clean-tests depend-noforce populate-noforce populat
328331

329332
.PHONY: integration-tests-stable-negative
330333
integration-tests-stable-negative: clean-tests depend-noforce populate-noforce
331-
@. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
334+
@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
335+
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
336+
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
332337
cd $(FIXTURE_DOCKERENV_PATH) && \
333-
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
338+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
339+
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
334340
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
335341
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-negative.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
336-
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-negative.yaml"
342+
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-negative.yaml"
337343

338344
.PHONY: integration-tests-stable-pkcs11
339345
integration-tests-stable-pkcs11: clean-tests depend-noforce populate-noforce
340-
@. $(FIXTURE_DOCKERENV_PATH)/nomutualtls-env.sh && \
341-
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
346+
@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
347+
. $(FIXTURE_DOCKERENV_PATH)/nomutualtls-env.sh && \
348+
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
349+
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
342350
cd $(FIXTURE_DOCKERENV_PATH) && \
343-
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
351+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
352+
TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
344353
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
345354
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) -f docker-compose-pkcs11-test.yaml up $(DOCKER_COMPOSE_UP_TEST_FLAGS)
346-
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-pkcs11-test.yaml"
355+
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(FIXTURE_SCRIPTS_PATH)/check_status.sh "$(BASE_DOCKER_COMPOSE_FILES) -f ./docker-compose-pkcs11-test.yaml"
347356

348357
# Additional test cases that aren't currently run by the CI
349358
.PHONY: integration-tests-devstable-nomutualtls
@@ -405,9 +414,12 @@ integration-tests-local: clean-tests-temp depend-noforce populate-noforce
405414

406415
.PHONY: integration-tests-stable-local
407416
integration-tests-stable-local: clean-tests-temp depend-noforce populate-noforce
408-
@. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
417+
@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
418+
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
419+
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
409420
cd $(FIXTURE_DOCKERENV_PATH) && \
410-
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
421+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
422+
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
411423
GO_TESTFLAGS="$(GO_TESTFLAGS_INTEGRATION)" \
412424
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
413425
FABRIC_CRYPTOCONFIG_VERSION=$(FABRIC_CRYPTOCONFIG_VER) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_CODELEVEL_TAG) TEST_LOCAL=true $(TEST_SCRIPTS_PATH)/integration.sh
@@ -437,9 +449,12 @@ dockerenv-prev-up: clean-tests populate-fixtures-prev-noforce
437449

438450
.PHONY: dockerenv-stable-up
439451
dockerenv-stable-up: clean-tests populate-fixtures-stable-noforce
440-
@. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
452+
@. $(FIXTURE_DOCKERENV_PATH)/stable-env.sh && \
453+
. $(FIXTURE_CRYPTOCONFIG_PATH)/env.sh && \
454+
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
441455
cd $(FIXTURE_DOCKERENV_PATH) && \
442-
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY) \
456+
FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) $(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) pull $(DOCKER_COMPOSE_PULL_FLAGS) && \
457+
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY) \
443458
$(DOCKER_COMPOSE_CMD) $(BASE_DOCKER_COMPOSE_FILES) up $(DOCKER_COMPOSE_UP_STANDALONE_FLAGS)
444459

445460
.PHONY: dockerenv-prerelease-up

‎test/fixtures/dockerenv/stable-env.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
#
3+
# Copyright SecureKey Technologies Inc. All Rights Reserved.
4+
#
5+
# SPDX-License-Identifier: Apache-2.0
6+
#
7+
8+
# This file contains environment overrides to enable testing against
9+
# the stable target
10+
11+
export FABRIC_CA_FIXTURE_TAG="1.2.1-stable"
12+
export FABRIC_ORDERER_FIXTURE_TAG="1.2.1-stable"
13+
export FABRIC_PEER_FIXTURE_TAG="1.2.1-stable"
14+
export FABRIC_COUCHDB_FIXTURE_TAG="1.2.1-stable"
15+
export FABRIC_BUILDER_FIXTURE_TAG="1.2.1-stable"

0 commit comments

Comments
 (0)
⚡