Skip to content

Commit

Permalink
[FAB-7550] No Mutual TLS integration test case
Browse files Browse the repository at this point in the history
Change-Id: Ibbc998963b3aef23271705eb730638a0e4307615
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
troyronda committed Dec 22, 2017
1 parent 3d66361 commit 2f7918e
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
12 changes: 11 additions & 1 deletion Makefile
Expand Up @@ -243,6 +243,16 @@ integration-tests-stable-pkcs11: clean depend populate build-softhsm2-image
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 -f docker-compose-pkcs11-test.yaml up --force-recreate --abort-on-container-exit
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY)/ $(FIXTURE_SCRIPTS_PATH)/check_status.sh "-f ./docker-compose.yaml -f ./docker-compose-pkcs11-test.yaml"

# Additional test cases that aren't currently run by the CI
.PHONY: integration-tests-devstable-nomutualtls
integration-tests-devstable-nomutualtls: clean depend populate
@. $(FIXTURE_DOCKERENV_PATH)/devstable-env.sh && \
. $(FIXTURE_DOCKERENV_PATH)/nomutualtls-env.sh && \
$(FABRIC_DEV_REGISTRY_PRE_CMD) && \
cd $(FIXTURE_DOCKERENV_PATH) && \
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 -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(FIXTURE_SCRIPTS_PATH)/check_status.sh "-f ./docker-compose.yaml -f ./docker-compose-nopkcs11-test.yaml"

.PHONY: integration-tests
integration-tests: integration-test

Expand Down Expand Up @@ -374,7 +384,7 @@ endif
populate-clean:
rm -Rf vendor

.PHONY: clean
.PHONY: temp-clean
temp-clean:
-rm -Rf /tmp/enroll_user /tmp/msp /tmp/keyvaluestore /tmp/hfc-kvs /tmp/state
-rm -f integration-report.xml report.xml
Expand Down
16 changes: 16 additions & 0 deletions test/fixtures/dockerenv/nomutualtls-env.sh
@@ -0,0 +1,16 @@
#
# Copyright SecureKey Technologies Inc. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#

# This file contains environment overrides to enable testing
# against a fabric service that doesn't require TLS client authentication.

export CORE_PEER_TLS_CLIENTAUTHREQUIRED=false
export CORE_PEER_TLS_CLIENTROOTCAS_FILES=""
export ORDERER_GENERAL_TLS_CLIENTAUTHENABLED=false
export ORDERER_GENERAL_TLS_CLIENTROOTCAS=""

FABRIC_SDK_CLIENT_TLSCERTS_CLIENT_KEYFILE=""
FABRIC_SDK_CLIENT_TLSCERTS_CLIENT_CERTFILE=""

0 comments on commit 2f7918e

Please sign in to comment.