Skip to content

Attempt to fix post-submit #2 #2797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 2 commits into from
Apr 9, 2020
Merged

Attempt to fix post-submit #2 #2797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01de371
build before pushing
kyessenov Apr 9, 2020
737b81e
typo
kyessenov Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ artifacts:
test_release:
export PATH=$(PATH) CC=$(CC) CXX=$(CXX) BAZEL_BUILD_ARGS="$(BAZEL_BUILD_ARGS)" && ./scripts/release-binary.sh

push_release:
push_release: build
export PATH=$(PATH) CC=$(CC) CXX=$(CXX) BAZEL_BUILD_ARGS="$(BAZEL_BUILD_ARGS)" && ./scripts/release-binary.sh -d "$(RELEASE_GCS_PATH)" -p && ./scripts/generate-wasm.sh -b -p -d "$(RELEASE_GCS_PATH)"

.PHONY: build clean test check artifacts
Expand Down
36 changes: 18 additions & 18 deletions prow/proxy-common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ export BAZEL_OUT="$(bazel info ${BAZEL_BUILD_ARGS} output_path)/k8-fastbuild/bin
export BAZEL_BUILD_RBE_JOBS=0

# Use GCP service account when available.
# if [[ -n "${GOOGLE_APPLICATION_CREDENTIALS:-}" ]]; then
# echo "Detected GOOGLE_APPLICATION_CREDENTIALS, activating..." >&2
# gcloud auth activate-service-account --key-file="${GOOGLE_APPLICATION_CREDENTIALS}"
#
# # Use RBE when logged in.
# BAZEL_BUILD_RBE_INSTANCE="${BAZEL_BUILD_RBE_INSTANCE:-projects/istio-testing/instances/default_instance}"
# BAZEL_BUILD_RBE_CACHE="${BAZEL_BUILD_RBE_CACHE:-grpcs://remotebuildexecution.googleapis.com}"
# BAZEL_BUILD_RBE_JOBS="${BAZEL_BUILD_RBE_JOBS:-200}"
# if [[ -n "${BAZEL_BUILD_RBE_INSTANCE}" ]]; then
# if [[ "${BAZEL_BUILD_RBE_JOBS}" -gt 0 ]]; then
# echo "Using RBE: ${BAZEL_BUILD_RBE_INSTANCE} (execute)"
# export BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS} --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS} --config=remote-clang-libc++ --config=remote-ci --remote_instance_name=${BAZEL_BUILD_RBE_INSTANCE} --jobs=${BAZEL_BUILD_RBE_JOBS}"
# elif [[ -n "${BAZEL_BUILD_RBE_CACHE}" ]]; then
# echo "Using RBE: ${BAZEL_BUILD_RBE_INSTANCE} (cache)"
# export BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS} --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS} --remote_instance_name=${BAZEL_BUILD_RBE_INSTANCE} --remote_cache=${BAZEL_BUILD_RBE_CACHE}"
# fi
# fi
# fi
if [[ -n "${GOOGLE_APPLICATION_CREDENTIALS:-}" ]]; then
echo "Detected GOOGLE_APPLICATION_CREDENTIALS, activating..." >&2
gcloud auth activate-service-account --key-file="${GOOGLE_APPLICATION_CREDENTIALS}"

# Use RBE when logged in.
BAZEL_BUILD_RBE_INSTANCE="${BAZEL_BUILD_RBE_INSTANCE:-projects/istio-testing/instances/default_instance}"
BAZEL_BUILD_RBE_CACHE="${BAZEL_BUILD_RBE_CACHE:-grpcs://remotebuildexecution.googleapis.com}"
BAZEL_BUILD_RBE_JOBS="${BAZEL_BUILD_RBE_JOBS:-200}"
if [[ -n "${BAZEL_BUILD_RBE_INSTANCE}" ]]; then
if [[ "${BAZEL_BUILD_RBE_JOBS}" -gt 0 ]]; then
echo "Using RBE: ${BAZEL_BUILD_RBE_INSTANCE} (execute)"
export BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS} --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS} --config=remote-clang-libc++ --config=remote-ci --remote_instance_name=${BAZEL_BUILD_RBE_INSTANCE} --jobs=${BAZEL_BUILD_RBE_JOBS}"
elif [[ -n "${BAZEL_BUILD_RBE_CACHE}" ]]; then
echo "Using RBE: ${BAZEL_BUILD_RBE_INSTANCE} (cache)"
export BAZEL_BUILD_ARGS="${BAZEL_BUILD_ARGS} --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS} --remote_instance_name=${BAZEL_BUILD_RBE_INSTANCE} --remote_cache=${BAZEL_BUILD_RBE_CACHE}"
fi
fi
fi