istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix MacOS tests using a container (#8197) 

* Fix MacOS tests using a container

* istioctl was wrong OS in container

* export IN_BUILD_CONTAINER
This commit is contained in:
Eric Van Norman 2020-09-23 14:35:54 -05:00 committed by GitHub
parent 65e28d2b6c
commit eadaa2d6bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.core.mk
View File

@ -22,7 +22,8 @@ export GO_TOP
GO ?= go
GOARCH_LOCAL := $(TARGET_ARCH)
GOOS_LOCAL := $(TARGET_OS)
export GOOS_LOCAL := $(TARGET_OS)
export IN_BUILD_CONTAINER := $(IN_BUILD_CONTAINER)
# ISTIO_IMAGE_VERSION stores the prefix used by default for the Docker images for Istio.
# For example, a value of 1.6-alpha will assume a default TAG value of 1.6-dev.<SHA>

12
bin/init.sh
View File

@ -73,9 +73,15 @@ export ISTIO_VERSION=${TAG}
echo "TAG=${TAG}"
echo "VERSION=${VERSION}"
echo "ISTIO_VERSION=${ISTIO_VERSION}"
make gen-charts "$ISTIOCTL_ARTIFACT"
cp -a "$ISTIOCTL_ARTIFACT" "${ISTIOIO_BIN}/istioctl"
make gen-charts
if [ -z "$IN_BUILD_CONTAINER" ]
then
make "$ISTIOCTL_ARTIFACT"
cp -a "$ISTIOCTL_ARTIFACT" "${ISTIOIO_BIN}/istioctl"
else
make "${ISTIO_OUT}/release/istioctl-linux-amd64"
cp -a "${ISTIO_OUT}/release/istioctl-linux-amd64" /gobin/istioctl
fi
popd > /dev/null
# Copy install, samples, and tool files over from Istio. These are needed by the tests.