Commit f9803b40 authored by rameshthoomu's avatar rameshthoomu Committed by David Enyeart
Browse files

FAB-12153 Disable javaenv-docker from tests



Change-Id: I91dd6c42b6470b84704b18ca9926f7948e5319c8
Signed-off-by: default avatarrameshthoomu <rameshbabu.thoomu@gmail.com>
parent 8ab67cff
......@@ -40,12 +40,11 @@
# - enable_ci_only_tests - triggers unit-tests in downstream jobs. Applicable only for CI not to
# use in the local machine.
# - docker-thirdparty - pulls thirdparty images (kafka,zookeeper,couchdb)
# - javaenv-docker - pulls javaenv image from nexus and re-tags to amd64-latest tag
# - docker-tag-latest - re-tags the images made by 'make docker' with the :latest tag
# - docker-tag-stable - re-tags the images made by 'make docker' with the :stable tag
# - help-docs - generate the command reference docs
BASE_VERSION = 1.3.0
BASE_VERSION = 1.3.0-rc1
PREV_VERSION = 1.2.0
CHAINTOOL_RELEASE=1.1.1
BASEIMAGE_RELEASE=0.4.12
......@@ -140,18 +139,6 @@ docker-thirdparty:
docker pull $(BASE_DOCKER_NS)/fabric-kafka:$(BASE_DOCKER_TAG)
docker tag $(BASE_DOCKER_NS)/fabric-kafka:$(BASE_DOCKER_TAG) $(DOCKER_NS)/fabric-kafka
# Pull javenv docker image based on the stable version published to nexus
.PHONY: javaenv-docker
javaenv-docker:
if [ "$(ARCH)" = "amd64" ]; then \
echo "Pull Javaenv on $(ARCH)"; \
docker pull $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG); \
docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv; \
docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv:$(ARCH)-latest; \
else \
echo "------> Javaenv Image is not available on $(ARCH)"; \
fi
.PHONY: spelling
spelling:
@scripts/check_spelling.sh
......@@ -198,10 +185,10 @@ testenv: $(BUILD_DIR)/image/testenv/$(DUMMY)
ccenv: $(BUILD_DIR)/image/ccenv/$(DUMMY)
.PHONY: integration-test
integration-test: gotool.ginkgo javaenv-docker ccenv docker-thirdparty
integration-test: gotool.ginkgo ccenv docker-thirdparty
./scripts/run-integration-tests.sh
unit-test: unit-test-clean peer-docker javaenv-docker testenv ccenv
unit-test: unit-test-clean peer-docker testenv ccenv
cd unit-test && docker-compose up --abort-on-container-exit --force-recreate && docker-compose down
unit-tests: unit-test
......@@ -434,7 +421,6 @@ docker-list: $(patsubst %,%-docker-list, $(IMAGES))
%-docker-clean:
$(eval TARGET = ${patsubst %-docker-clean,%,${@}})
-docker images --quiet --filter=reference='$(DOCKER_NS)/fabric-$(TARGET):$(ARCH)-$(BASE_VERSION)$(if $(EXTRA_VERSION),-snapshot-*,)' | xargs docker rmi -f
-docker rmi -f $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG)
-@rm -rf $(BUILD_DIR)/image/$(TARGET) ||:
docker-clean: $(patsubst %,%-docker-clean, $(IMAGES))
......
......@@ -56,8 +56,6 @@ DBUILD = docker build $(DOCKER_BUILD_FLAGS)
BASE_DOCKER_NS ?= hyperledger
BASE_DOCKER_TAG=$(ARCH)-$(BASEIMAGE_RELEASE)
STABLE_TAG=$(ARCH)-$(BASE_VERSION)-stable
DOCKER_NS ?= hyperledger
DOCKER_TAG=$(ARCH)-$(PROJECT_VERSION)
PREV_TAG=$(ARCH)-$(PREV_VERSION)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment