Skip to content
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

Stop calling configure_environment #4644

Merged
merged 1 commit into from
Jan 6, 2025
+0 −16
Merged

Stop calling configure_environment #4644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions cobalt/devinfra/kokoro/bin/dind_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions cobalt/devinfra/kokoro/bin/dind_builder_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cobalt/devinfra/kokoro/bin/dind_py/main_build_image_and_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions cobalt/devinfra/kokoro/bin/dind_py/main_pull_image_and_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions cobalt/devinfra/kokoro/bin/dind_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
Loading