Skip to content

Commit 7d63bff

Browse files
authored
Centralize gcluster extraction in get_binary.sh (#5756)
1 parent 7c59ad2 commit 7d63bff

72 files changed

Lines changed: 104 additions & 519 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tools/cloud-build/daily-tests/builds/ansible-vm.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,7 @@ steps:
4141
- |
4242
set -x -e
4343
cd /workspace
44-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
45-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
46-
unzip -o gcluster-bundle.zip
47-
# Grant execution permissions to the binary
48-
chmod +x gcluster
49-
else
50-
make
51-
fi
44+
bash tools/get_binary.sh "${_TEST_PREFIX}"
5245
BUILD_ID_FULL=$BUILD_ID
5346
BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
5447
BLUEPRINT="tools/cloud-build/daily-tests/blueprints/ansible-vm.yaml"

tools/cloud-build/daily-tests/builds/batch-mpi.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,7 @@ steps:
5555
- |
5656
set -x -e
5757
cd /workspace
58-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
59-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
60-
unzip -o gcluster-bundle.zip
61-
# Grant execution permissions to the binary
62-
chmod +x gcluster
63-
else
64-
make
65-
fi
58+
bash tools/get_binary.sh "${_TEST_PREFIX}"
6659
BUILD_ID_FULL=$BUILD_ID
6760
BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
6861
SG_EXAMPLE=examples/batch-mpi.yaml

tools/cloud-build/daily-tests/builds/batch.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,7 @@ steps:
4242
- |
4343
set -x -e
4444
cd /workspace
45-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
46-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
47-
unzip -o gcluster-bundle.zip
48-
# Grant execution permissions to the binary
49-
chmod +x gcluster
50-
else
51-
make
52-
fi
45+
bash tools/get_binary.sh "${_TEST_PREFIX}"
5346
BUILD_ID_FULL=$BUILD_ID
5447
BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
5548
BLUEPRINT=examples/batch.yaml

tools/cloud-build/daily-tests/builds/chrome-remote-desktop-ubuntu.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,7 @@ steps:
4040
- |
4141
set -x -e
4242
cd /workspace
43-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
44-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
45-
unzip -o gcluster-bundle.zip
46-
# Grant execution permissions to the binary
47-
chmod +x gcluster
48-
else
49-
make
50-
fi
43+
bash tools/get_binary.sh "${_TEST_PREFIX}"
5144
BUILD_ID_FULL=$BUILD_ID
5245
BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
5346
BLUEPRINT=tools/cloud-build/daily-tests/blueprints/crd-ubuntu.yaml

tools/cloud-build/daily-tests/builds/chrome-remote-desktop.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,7 @@ steps:
4141
- |
4242
set -x -e
4343
cd /workspace
44-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
45-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
46-
unzip -o gcluster-bundle.zip
47-
# Grant execution permissions to the binary
48-
chmod +x gcluster
49-
else
50-
make
51-
fi
44+
bash tools/get_binary.sh "${_TEST_PREFIX}"
5245
BUILD_ID_FULL=$BUILD_ID
5346
BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
5447
BLUEPRINT=tools/cloud-build/daily-tests/blueprints/crd-default.yaml

tools/cloud-build/daily-tests/builds/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ steps:
4040
vars="project_id=$PROJECT_ID,deployment_name=$depl_name,region=$region,zone=$zone"
4141
4242
cd /workspace
43-
make
43+
bash tools/get_binary.sh "" "true"
4444
BLUEPRINT="tools/cloud-build/daily-tests/blueprints/e2e.yaml"
4545
bash tools/add_ttl_label.sh "${BLUEPRINT}"
4646
./gcluster deploy "${BLUEPRINT}" --vars="$vars" --auto-approve

tools/cloud-build/daily-tests/builds/gke-a2-highgpu-kueue-onspot.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,7 @@ steps:
7676
fi
7777
set -x
7878
cd /workspace
79-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
80-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
81-
unzip -o gcluster-bundle.zip
82-
# Grant execution permissions to the binary
83-
chmod +x gcluster
84-
else
85-
make
86-
fi
79+
bash tools/get_binary.sh "${_TEST_PREFIX}"
8780
BUILD_ID_SHORT=$${BUILD_ID:0:6}
8881
EXAMPLE_BP=tools/cloud-build/daily-tests/blueprints/gke-a2-highgpu.yaml
8982

tools/cloud-build/daily-tests/builds/gke-a3-highgpu-onspot.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,7 @@ steps:
5757
fi
5858
set -x
5959
cd /workspace
60-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
61-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
62-
unzip -o gcluster-bundle.zip
63-
# Grant execution permissions to the binary
64-
chmod +x gcluster
65-
else
66-
make
67-
fi
60+
bash tools/get_binary.sh "${_TEST_PREFIX}"
6861
REGION="$${ZONE%-*}"
6962
BUILD_ID_SHORT=$${BUILD_ID:0:6}
7063
EXAMPLE_BP=examples/gke-a3-highgpu/gke-a3-highgpu.yaml

tools/cloud-build/daily-tests/builds/gke-a3-highgpu.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,7 @@ steps:
4343
- |
4444
set -x -e
4545
cd /workspace
46-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
47-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
48-
unzip -o gcluster-bundle.zip
49-
# Grant execution permissions to the binary
50-
chmod +x gcluster
51-
else
52-
make
53-
fi
46+
bash tools/get_binary.sh "${_TEST_PREFIX}"
5447
BUILD_ID_FULL=$BUILD_ID
5548
BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
5649
EXAMPLE_BP=examples/gke-a3-highgpu/gke-a3-highgpu.yaml

tools/cloud-build/daily-tests/builds/gke-a3-megagpu-onspot.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,7 @@ steps:
5757
fi
5858
set -x
5959
cd /workspace
60-
if [ "${_TEST_PREFIX}" == "daily-" ]; then
61-
gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
62-
unzip -o gcluster-bundle.zip
63-
# Grant execution permissions to the binary
64-
chmod +x gcluster
65-
else
66-
make
67-
fi
60+
bash tools/get_binary.sh "${_TEST_PREFIX}"
6861
REGION="$${ZONE%-*}"
6962
BUILD_ID_SHORT=$${BUILD_ID:0:6}
7063
EXAMPLE_BP=examples/gke-a3-megagpu/gke-a3-megagpu.yaml

0 commit comments

Comments
 (0)