Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 1 addition & 15 deletions tools/cloud-build/daily-tests/builds/gke-tpu-7x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ steps:
- -c
- |
set -e -u -o pipefail
echo "Sourcing find_available_zone.sh to determine zone."
source /workspace/tools/cloud-build/find_available_zone.sh
if [ -z "$${ZONE:-}" ]; then
echo "ERROR: ZONE not found" >&2
exit 1
fi
set -x
cd /workspace
if [ "${_TEST_PREFIX}" == "daily-" ]; then
Expand All @@ -66,7 +60,6 @@ steps:
else
make
fi
REGION="$${ZONE%-*}"
BUILD_ID_SHORT="$${BUILD_ID:0:6}"
EXAMPLE_BP=examples/gke-tpu-7x/gke-tpu-7x.yaml
# adding vm to act as remote node
Expand All @@ -92,13 +85,6 @@ steps:

ENABLE_SPOT="true"
GKE_VARS_FILE="tools/cloud-build/daily-tests/tests/gke-tpu-7x.yml"
if [[ "$$PROVISIONING_MODEL" == "STANDARD" ]]; then
ENABLE_SPOT="false"
sed -i '/instance_labels:/,+1d' "$${GKE_VARS_FILE}"
sed -i '/enable_spot: true/d' "$${GKE_VARS_FILE}"
else
echo "INFO: Using $${GKE_VARS_FILE} as it is for SPOT provisioning."
fi

sed -i -e '/reservation_affinity:/,+3c\ spot: '"$$ENABLE_SPOT"'' $${EXAMPLE_BP}
sed -i '/reservation/d' $${EXAMPLE_BP}
Expand All @@ -107,7 +93,7 @@ steps:
ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/base-integration-test.yml \
--user=sa_106486320838376751393 \
--extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
--extra-vars="region=$${REGION} zone=$${ZONE}" \
--extra-vars="region=us-central1 zone=us-central1-c" \
--extra-vars="enable_spot=$${ENABLE_SPOT}" \
--extra-vars="@$${GKE_VARS_FILE}"
secretEnv: ['GCLUSTER_GCS_PATH']
Expand Down
Loading