Skip to content

Commit 78c827c

Browse files
committed
FABCI-106 Ignore pulling javaenv from s390x
Javaenv image is not available on s390x builds which is causing s390x build failures. Update Makefile to ignore pulling s390x javaenv. Change-Id: Ie9bdd295226b045a0dbc44196e187b91302bbe4c Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
1 parent 3d1a36a commit 78c827c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,14 @@ docker-thirdparty:
143143
# Pull javenv docker image based on the stable version published to nexus
144144
.PHONY: javaenv-docker
145145
javaenv-docker:
146-
docker pull $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG)
147-
docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv
148-
docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv:$(ARCH)-latest
146+
if [ "$(ARCH)" = "amd64" ]; then \
147+
echo "Pull Javaenv on $(ARCH)"; \
148+
docker pull $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG); \
149+
docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv; \
150+
docker tag $(NEXUS_REPO)/fabric-javaenv:$(STABLE_TAG) $(DOCKER_NS)/fabric-javaenv:$(ARCH)-latest; \
151+
else \
152+
echo "------> Javaenv Image is not available on $(ARCH)"; \
153+
fi
149154

150155
.PHONY: spelling
151156
spelling:

0 commit comments

Comments
 (0)