From 7e87947f2c50a82e3cd8facd135bed84f6361da1 Mon Sep 17 00:00:00 2001
From: Dana Dahlstrom <dahlstrom@google.com>
Date: Sat, 4 Jan 2025 00:00:00 -0800
Subject: [PATCH] Stop calling configure_environment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… in main Kokoro build scripts.

Issue: 365150653
Reviewed-on: https://github.com/youtube/cobalt/pull/4644
---
 cobalt/devinfra/kokoro/bin/dind_build.sh                      | 4 ----
 cobalt/devinfra/kokoro/bin/dind_builder_runner.sh             | 4 ----
 .../devinfra/kokoro/bin/dind_py/main_build_image_and_run.py   | 2 --
 cobalt/devinfra/kokoro/bin/dind_py/main_pull_image_and_run.py | 2 --
 cobalt/devinfra/kokoro/bin/dind_runner.sh                     | 4 ----
 5 files changed, 16 deletions(-)

diff --git a/cobalt/devinfra/kokoro/bin/dind_build.sh b/cobalt/devinfra/kokoro/bin/dind_build.sh
index cc41bed4a4d0..bbc8a7796aa5 100755
--- a/cobalt/devinfra/kokoro/bin/dind_build.sh
+++ b/cobalt/devinfra/kokoro/bin/dind_build.sh
@@ -8,13 +8,11 @@
 # Kokoro Instance
 # └── Generic DinD Image
 #     ├── dind_builder_runner.sh
-#     │   ├── configure_environment (common.sh)
 #     │   ├── main_build_image_and_run.py
 #     │   │   └── Specific Cobalt Image
 #     │   │       └── dind_build.sh                             <= THIS SCRIPT
 #     │   └── run_package_release_pipeline (common.sh)
 #     └── dind_runner.sh
-#         ├── configure_environment (common.sh)
 #         ├── main_pull_image_and_run.py
 #         │   └── Specific Cobalt Image
 #         │       └── dind_build.sh                             <= THIS SCRIPT
@@ -44,8 +42,6 @@ fi
 
 WORKSPACE_COBALT="${KOKORO_ARTIFACTS_DIR}/git/src"
 
-configure_environment
-
 pipeline () {
   local out_dir="${WORKSPACE_COBALT}/out/${TARGET_PLATFORM}_${CONFIG}"
   local gclient_root="${KOKORO_ARTIFACTS_DIR}/chromium"
diff --git a/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh b/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh
index 302a395106d0..efe6f5998b93 100755
--- a/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh
+++ b/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh
@@ -9,13 +9,11 @@
 # Kokoro Instance
 # └── Generic DinD Image
 #     ├── dind_builder_runner.sh                              <== THIS SCRIPT
-#     │   ├── configure_environment (common.sh)
 #     │   ├── main_build_image_and_run.py
 #     │   │   └── Specific Cobalt Image
 #     │   │       └── dind_build.sh
 #     │   └── run_package_release_pipeline (common.sh)
 #     └── dind_runner.sh
-#         ├── configure_environment (common.sh)
 #         ├── main_pull_image_and_run.py
 #         │   └── Specific Cobalt Image
 #         │       └── dind_build.sh
@@ -34,8 +32,6 @@ trap "bash ${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/cleanup.sh" EXIT INT T
 
 configure_dind_environment
 
-configure_environment
-
 set -x
 # The python script is responsible for running containerized Cobalt builds.
 python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/dind_py/main_build_image_and_run.py"
diff --git a/cobalt/devinfra/kokoro/bin/dind_py/main_build_image_and_run.py b/cobalt/devinfra/kokoro/bin/dind_py/main_build_image_and_run.py
index a3f3cd07be90..196d161b1655 100644
--- a/cobalt/devinfra/kokoro/bin/dind_py/main_build_image_and_run.py
+++ b/cobalt/devinfra/kokoro/bin/dind_py/main_build_image_and_run.py
@@ -24,13 +24,11 @@
    Kokoro Instance
    └── Generic DinD Image
        ├── dind_builder_runner.sh
-       │   ├── configure_environment (common.sh)
        │   ├── main_build_image_and_run.py                      <= THIS SCRIPT
        │   │   └── Specific Cobalt Image
        │   │       └── dind_build.sh
        │   └── run_package_release_pipeline (common.sh)
        └── dind_runner.sh
-           ├── configure_environment (common.sh)
            ├── main_pull_image_and_run.py
            │   └── Specific Cobalt Image
            │       └── dind_build.sh
diff --git a/cobalt/devinfra/kokoro/bin/dind_py/main_pull_image_and_run.py b/cobalt/devinfra/kokoro/bin/dind_py/main_pull_image_and_run.py
index a7e14582f22c..852c11137c7b 100644
--- a/cobalt/devinfra/kokoro/bin/dind_py/main_pull_image_and_run.py
+++ b/cobalt/devinfra/kokoro/bin/dind_py/main_pull_image_and_run.py
@@ -21,13 +21,11 @@
    Kokoro Instance
    └── Generic DinD Image
        ├── dind_builder_runner.sh
-       │   ├── configure_environment (common.sh)
        │   ├── main_build_image_and_run.py
        │   │   └── Specific Cobalt Image
        │   │       └── dind_build.sh
        │   └── run_package_release_pipeline (common.sh)
        └── dind_runner.sh
-           ├── configure_environment (common.sh)
            ├── main_pull_image_and_run.py                       <= THIS SCRIPT
            │   └── Specific Cobalt Image
            │       └── dind_build.sh
diff --git a/cobalt/devinfra/kokoro/bin/dind_runner.sh b/cobalt/devinfra/kokoro/bin/dind_runner.sh
index 157aa6141caa..012fc58fa94a 100755
--- a/cobalt/devinfra/kokoro/bin/dind_runner.sh
+++ b/cobalt/devinfra/kokoro/bin/dind_runner.sh
@@ -9,13 +9,11 @@
 # Kokoro Instance
 # └── Generic DinD Image
 #     ├── dind_builder_runner.sh
-#     │   ├── configure_environment (common.sh)
 #     │   ├── main_build_image_and_run.py
 #     │   │   └── Specific Cobalt Image
 #     │   │       └── dind_build.sh
 #     │   └── run_package_release_pipeline (common.sh)
 #     └── dind_runner.sh                                    <== THIS SCRIPT
-#         ├── configure_environment (common.sh)
 #         ├── main_pull_image_and_run.py
 #         │   └── Specific Cobalt Image
 #         │       └── dind_build.sh
@@ -34,8 +32,6 @@ trap "bash ${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/cleanup.sh" EXIT INT T
 
 configure_dind_environment
 
-configure_environment
-
 set -x
 # The python script is responsible for running containerized Cobalt builds.
 python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/dind_py/main_pull_image_and_run.py"