@@ -75,13 +75,15 @@ FIXTURE_DOCKER_REMOVE_FORCE ?= false
7575FABRIC_SDK_DEPRECATED_UNITTEST ?= false
7676
7777# Code levels to exercise integration/e2e tests against (overridable)
78- FABRIC_STABLE_INTTEST ?= true
79- FABRIC_STABLE_PKCS11_INTTEST ?= false
80- FABRIC_STABLE_REVOKED_INTTEST ?= false
81- FABRIC_STABLE_EXPIRED_INTTEST ?= false
82- FABRIC_PREV_INTTEST ?= false
83- FABRIC_PRERELEASE_INTTEST ?= false
84- FABRIC_DEVSTABLE_INTTEST ?= false
78+ FABRIC_STABLE_INTTEST ?= true
79+ FABRIC_STABLE_PKCS11_INTTEST ?= false
80+ FABRIC_STABLE_REVOKED_INTTEST ?= false
81+ FABRIC_STABLE_EXPIRED_INTTEST ?= false
82+ FABRIC_PREV_INTTEST ?= false
83+ FABRIC_PRERELEASE_INTTEST ?= false
84+ FABRIC_DEVSTABLE_INTTEST ?= false
85+ FABRIC_STABLE_LOCAL_INTTEST ?= false
86+ FABRIC_DEVSTABLE_LOCAL_INTTEST ?= false
8587
8688# Code levels
8789FABRIC_STABLE_CODELEVEL_TAG := stable
@@ -151,6 +153,8 @@ FABRIC_STABLE_EXPIRED_INTTEST := true
151153FABRIC_PREV_INTTEST := true
152154FABRIC_PRERELEASE_INTTEST := false
153155FABRIC_DEVSTABLE_INTTEST := false
156+ FABRIC_STABLE_LOCAL_INTTEST := false
157+ FABRIC_DEVSTABLE_LOCAL_INTTEST := false
154158endif
155159
156160# Setup Go Tags
@@ -338,13 +342,37 @@ endif
338342ifeq ($(FABRIC_PREV_INTTEST ) ,true)
339343 @$(MAKE) -f $(MAKEFILE_THIS) clean
340344 @FABRIC_SDKGO_SUBTARGET=true $(MAKE) -f $(MAKEFILE_THIS) integration-tests-prev
345+ endif
346+ ifeq ($(FABRIC_STABLE_LOCAL_INTTEST ) ,true)
347+ @$(MAKE) -f $(MAKEFILE_THIS) clean
348+ @FABRIC_SDKGO_SUBTARGET=true $(MAKE) -f $(MAKEFILE_THIS) integration-tests-stable-local
349+ endif
350+ ifeq ($(FABRIC_DEVSTABLE_LOCAL_INTTEST ) ,true)
351+ @$(MAKE) -f $(MAKEFILE_THIS) clean
352+ @FABRIC_SDKGO_SUBTARGET=true $(MAKE) -f $(MAKEFILE_THIS) integration-tests-devstable-local
341353endif
342354 @$(MAKE) -f $(MAKEFILE_THIS) clean
343355
344356.PHONY : integration-tests-local
345357integration-tests-local : temp-clean depend populate
346358 TEST_CHANGED_ONLY=true 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
347359
360+ .PHONY : integration-tests-stable-local
361+ integration-tests-stable-local : temp-clean depend populate
362+ @cd $(FIXTURE_DOCKERENV_PATH ) && \
363+ FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER ) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG ) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY ) $(DOCKER_COMPOSE_CMD ) -f docker-compose.yaml up -d --force-recreate
364+ 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
365+ @cd $(FIXTURE_DOCKERENV_PATH ) && $(DOCKER_COMPOSE_CMD ) down
366+
367+ .PHONY : integration-tests-devstable-local
368+ integration-tests-devstable-local : temp-clean depend populate
369+ @. $(FIXTURE_DOCKERENV_PATH ) /devstable-env.sh && \
370+ $(FABRIC_DEV_REGISTRY_PRE_CMD ) && \
371+ cd $(FIXTURE_DOCKERENV_PATH ) && \
372+ FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER ) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG ) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY ) $(DOCKER_COMPOSE_CMD ) -f docker-compose.yaml up -d --force-recreate
373+ FABRIC_FIXTURE_VERSION=v$(FABRIC_DEVSTABLE_VERSION_MINOR ) FABRIC_CRYPTOCONFIG_VERSION=$(FABRIC_CRYPTOCONFIG_VER ) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER ) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG ) TEST_LOCAL=true $(TEST_SCRIPTS_PATH ) /integration.sh
374+ @cd $(FIXTURE_DOCKERENV_PATH ) && $(DOCKER_COMPOSE_CMD ) down
375+
348376.PHONY : dockerenv-prev-up
349377dockerenv-prev-up : clean
350378 @cd $(FIXTURE_DOCKERENV_PATH ) && \
0 commit comments