Revert "CTK Enhancement: Updating binary using zip and secrets" (GoogleCloudPlatform#5158)

Author: kvenkatachala333

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

@@ -37,19 +37,10 @@ steps:
   - -c
   - |
     set -x -e
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     BUILD_ID_FULL=$BUILD_ID
     BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
 
     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="@tools/cloud-build/daily-tests/tests/ansible-vm.yml"
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'

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

@@ -30,8 +30,6 @@ availableSecrets:
   secretManager:
   - versionName: projects/$PROJECT_ID/secrets/spack_cache_url_wrf/versions/1
     env: SPACK_CACHE_WRF
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'
 
 steps:
 # While using static network names we are guarding against more than 1 instance running at a time (for multi-group tests)
@@ -46,16 +44,12 @@ steps:
   env:
   - "ANSIBLE_HOST_KEY_CHECKING=false"
   - "ANSIBLE_CONFIG=/workspace/tools/cloud-build/ansible.cfg"
-  secretEnv: ['SPACK_CACHE_WRF', 'GCLUSTER_GCS_PATH']
+  secretEnv: ['SPACK_CACHE_WRF']
   args:
   - -c
   - |
     set -x -e
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     BUILD_ID_FULL=$BUILD_ID
     BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
     SG_EXAMPLE=examples/serverless-batch-mpi.yaml

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

@@ -36,19 +36,10 @@ steps:
   - -c
   - |
     set -x -e
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     BUILD_ID_FULL=$BUILD_ID
     BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
 
     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} os=ubuntu" \
       --extra-vars="@tools/cloud-build/daily-tests/tests/chrome-remote-desktop.yml"
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'

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

@@ -37,19 +37,10 @@ steps:
   - -c
   - |
     set -x -e
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     BUILD_ID_FULL=$BUILD_ID
     BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
 
     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} os=default" \
       --extra-vars="@tools/cloud-build/daily-tests/tests/chrome-remote-desktop.yml"
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'

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

@@ -38,19 +38,10 @@ steps:
   - -c
   - |
     set -x -e
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     BUILD_ID_FULL=$BUILD_ID
     BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
 
     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="@tools/cloud-build/daily-tests/tests/cloud-batch.yml"
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'

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

@@ -37,18 +37,10 @@ steps:
     vars="project_id=$PROJECT_ID,deployment_name=$depl_name,region=$region,zone=$zone"
 
     cd /workspace
-    gsutil cp gs://${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    make
     ./gcluster deploy tools/cloud-build/daily-tests/blueprints/e2e.yaml --vars="$vars" --auto-approve
 
     # check instance was created
     gcloud compute instances describe "${depl_name}-0" --project="$PROJECT_ID" --zone="$zone" >/dev/null
 
     ./gcluster destroy "$depl_name" --auto-approve
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'

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

@@ -68,11 +68,7 @@ steps:
       echo "Resource policy $${POLICY_NAME} already exists in region $${REGION}."
     fi
     set -x
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     BUILD_ID_SHORT=$${BUILD_ID:0:6}
     EXAMPLE_BP=tools/cloud-build/daily-tests/blueprints/gke-a2-highgpu.yaml
 
@@ -93,8 +89,3 @@ steps:
         --user=sa_106486320838376751393 --extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
         --extra-vars="region=$${REGION} zone=$${ZONE}" \
         --extra-vars="@tools/cloud-build/daily-tests/tests/gke-a2-highgpu-kueue-onspot.yml"
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'

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

@@ -39,11 +39,7 @@ steps:
   - -c
   - |
     set -x -e
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     BUILD_ID_FULL=$BUILD_ID
     BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
     EXAMPLE_BP=tools/cloud-build/daily-tests/blueprints/gke-a2-highgpu.yaml
@@ -58,8 +54,3 @@ 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="@tools/cloud-build/daily-tests/tests/gke-a2-highgpu-kueue.yml"
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'

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

@@ -52,11 +52,7 @@ steps:
       exit 1
     fi
     set -x
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     REGION="$${ZONE%-*}"
     BUILD_ID_SHORT=$${BUILD_ID:0:6}
     EXAMPLE_BP=examples/gke-a3-highgpu.yaml
@@ -89,8 +85,3 @@ steps:
         --user=sa_106486320838376751393 --extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
         --extra-vars="region=$${REGION} zone=$${ZONE}" \
         --extra-vars="@tools/cloud-build/daily-tests/tests/gke-a3-highgpu-onspot.yml"
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'

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

@@ -39,11 +39,7 @@ steps:
   - -c
   - |
     set -x -e
-    cd /workspace
-    gsutil cp gs://$${GCLUSTER_GCS_PATH}/latest/gcluster-bundle.zip .
-    unzip -o gcluster-bundle.zip
-    # Grant execution permissions to the binary
-    chmod +x gcluster
+    cd /workspace && make
     BUILD_ID_FULL=$BUILD_ID
     BUILD_ID_SHORT=$${BUILD_ID_FULL:0:6}
     EXAMPLE_BP=examples/gke-a3-highgpu.yaml
@@ -70,8 +66,3 @@ 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="@tools/cloud-build/daily-tests/tests/gke-a3-highgpu.yml"
-  secretEnv: ['GCLUSTER_GCS_PATH']
-availableSecrets:
-  secretManager:
-  - versionName: projects/${PROJECT_ID}/secrets/gcluster-develop-release-bucket/versions/latest
-    env: 'GCLUSTER_GCS_PATH'