Update kokoro path to cobalt/devinfra/kokoro

Issue: 365150653 Reviewed-on: #4440
youtube · Nov 15, 2024 · ed1ccc2 · ed1ccc2
1 parent 7fea434
commit ed1ccc2
Show file tree

Hide file tree

Showing 33 changed files with 42 additions and 42 deletions.
diff --git a/cobalt/devinfra/kokoro/bin/build.sh b/cobalt/devinfra/kokoro/bin/build.sh
@@ -9,7 +9,7 @@ WORKSPACE_COBALT="${KOKORO_ARTIFACTS_DIR}/git/src"
 cd "${WORKSPACE_COBALT}"
 
 # Clean up workspace on exit or error.
-trap "bash ${WORKSPACE_COBALT}/internal/kokoro/bin/cleanup.sh" EXIT INT TERM
+trap "bash ${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/cleanup.sh" EXIT INT TERM
 
 
 # Linux build script.
@@ -27,9 +27,9 @@ pipeline () {
     echo "Evergreen Loader is configured."
     # Deploy static manifest.json (see b/338287855#comment24)
     if [[ "${PLATFORM}" =~ "evergreen-arm-hardfp" ]]; then
-      cp "${WORKSPACE_COBALT}/internal/kokoro/bin/manifest.json" "${out_dir}/install/usr/share/manifest.json"
+      cp "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/manifest.json" "${out_dir}/install/usr/share/manifest.json"
     elif [[ "${PLATFORM}" =~ "evergreen-arm-softfp" ]]; then
-      cp "${WORKSPACE_COBALT}/internal/kokoro/bin/manifest.json" "${WORKSPACE_COBALT}/chrome/updater/version_manifest/manifest.json"
+      cp "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/manifest.json" "${WORKSPACE_COBALT}/chrome/updater/version_manifest/manifest.json"
     fi
 
     local bootloader_out_dir="${WORKSPACE_COBALT}/out/${BOOTLOADER}_${CONFIG}"
@@ -55,13 +55,13 @@ pipeline () {
     # Create release package.
     if [[ "${PLATFORM}" =~ "android" ]]; then
       # Creates Android package directory.
-      python3 "${WORKSPACE_COBALT}/internal/kokoro/build/android/simple_packager.py" \
+      python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/build/android/simple_packager.py" \
         "${out_dir}" \
         "${package_dir}" \
         "${WORKSPACE_COBALT}"
     elif [[ "${PLATFORM}" =~ "evergreen" ]]; then
       # Creates Evergreen package directory.
-      python3 "${WORKSPACE_COBALT}/internal/kokoro/build/evergreen/simple_packager.py" \
+      python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/build/evergreen/simple_packager.py" \
         "${out_dir}" \
         "${package_dir}" \
         "${bootloader_out_dir:-}"

diff --git a/cobalt/devinfra/kokoro/bin/common.sh b/cobalt/devinfra/kokoro/bin/common.sh
@@ -301,7 +301,7 @@ run_package_release_pipeline () {
     # Create release package.
     if [[ "${PLATFORM}" =~ "android" ]]; then
       # Creates Android package directory.
-      python3 "${WORKSPACE_COBALT}/internal/kokoro/build/android/simple_packager.py" \
+      python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/build/android/simple_packager.py" \
         "${out_dir}" \
         "${package_dir}" \
         "${WORKSPACE_COBALT}"
@@ -311,7 +311,7 @@ run_package_release_pipeline () {
         bootloader_out_dir="${WORKSPACE_COBALT}/out/${BOOTLOADER}_${CONFIG}"
       fi
       # Creates Evergreen package directory.
-      python3 "${WORKSPACE_COBALT}/internal/kokoro/build/evergreen/simple_packager.py" \
+      python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/build/evergreen/simple_packager.py" \
         "${out_dir}" \
         "${package_dir}" \
         "${bootloader_out_dir:-}"

diff --git a/cobalt/devinfra/kokoro/bin/dind_build.sh b/cobalt/devinfra/kokoro/bin/dind_build.sh
@@ -60,9 +60,9 @@ pipeline () {
 
     # Deploy static manifest.json (see b/338287855#comment24)
     if [[ "${PLATFORM}" =~ "evergreen-arm-hardfp" ]]; then
-      cp "${WORKSPACE_COBALT}/internal/kokoro/bin/manifest.json" "${out_dir}/install/usr/share/manifest.json"
+      cp "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/manifest.json" "${out_dir}/install/usr/share/manifest.json"
     elif [[ "${PLATFORM}" =~ "evergreen-arm-softfp" ]]; then
-      cp "${WORKSPACE_COBALT}/internal/kokoro/bin/manifest.json" "${WORKSPACE_COBALT}/chrome/updater/version_manifest/manifest.json"
+      cp "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/manifest.json" "${WORKSPACE_COBALT}/chrome/updater/version_manifest/manifest.json"
     fi
 
     local bootloader_out_dir="${WORKSPACE_COBALT}/out/${BOOTLOADER}_${CONFIG}"

diff --git a/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh b/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh
@@ -30,15 +30,15 @@ export WORKSPACE_COBALT="${KOKORO_ARTIFACTS_DIR}/git/src"
 cd "${WORKSPACE_COBALT}"
 
 # Clean up workspace on exit or error.
-trap "bash ${WORKSPACE_COBALT}/internal/kokoro/bin/cleanup.sh" EXIT INT TERM
+trap "bash ${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/cleanup.sh" EXIT INT TERM
 
 configure_dind_environment
 
 configure_environment
 
 set -x
 # The python script is responsible for running containerized Cobalt builds.
-python3 "${WORKSPACE_COBALT}/internal/kokoro/bin/dind_py/main_build_image_and_run.py"
+python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/dind_py/main_build_image_and_run.py"
 
 # The following script is responsible for creating packages and nightly builds
 # which do not need to run inside Cobalt containers.

diff --git a/cobalt/devinfra/kokoro/bin/dind_py/dind_common.py b/cobalt/devinfra/kokoro/bin/dind_py/dind_common.py
@@ -29,7 +29,7 @@
 
 # This build script is what needs to be invoked to run the full Cobalt build
 # within the inner Docker container.
-_INTERNAL_KOKORO_BUILD_SCRIPT = 'internal/kokoro/bin/dind_build.sh'
+_INTERNAL_KOKORO_BUILD_SCRIPT = 'cobalt/devinfra/kokoro/bin/dind_build.sh'
 
 _WORKSPACE_COBALT_VAR = 'WORKSPACE_COBALT'
 
@@ -134,7 +134,7 @@ def run_cobalt_build(image_to_run, src_root):
   os.environ['FULL_IMAGE_TARGET'] = image_to_run
   service = _DOCKER_COMPOSE_SERVICE_TARGET
   script = os.path.join(src_root, _INTERNAL_KOKORO_BUILD_SCRIPT)
-  compose_file = os.path.join(src_root, 'internal/kokoro/docker-compose.yml')
+  compose_file = os.path.join(src_root, 'cobalt/devinfra/kokoro/docker-compose.yml')
   compose_cmd = (f'docker compose -f {compose_file} ' +
                  f'run -T {service} /bin/bash -c {script}')
   utils.exec_cmd(compose_cmd)
diff --git a/cobalt/devinfra/kokoro/bin/dind_py/test-docker-compose.yml b/cobalt/devinfra/kokoro/bin/dind_py/test-docker-compose.yml
@@ -5,5 +5,5 @@ services:
   foo_test:
     image: foo_test
     build:
-      context: ${COBALT_SRC}/internal/kokoro/bin/dind_py
+      context: ${COBALT_SRC}/cobalt/devinfra/kokoro/bin/dind_py
       dockerfile: ./Dockerfile.test
diff --git a/cobalt/devinfra/kokoro/bin/dind_runner.sh b/cobalt/devinfra/kokoro/bin/dind_runner.sh
@@ -30,15 +30,15 @@ export WORKSPACE_COBALT="${KOKORO_ARTIFACTS_DIR}/git/src"
 cd "${WORKSPACE_COBALT}"
 
 # Clean up workspace on exit or error.
-trap "bash ${WORKSPACE_COBALT}/internal/kokoro/bin/cleanup.sh" EXIT INT TERM
+trap "bash ${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/cleanup.sh" EXIT INT TERM
 
 configure_dind_environment
 
 configure_environment
 
 set -x
 # The python script is responsible for running containerized Cobalt builds.
-python3 "${WORKSPACE_COBALT}/internal/kokoro/bin/dind_py/main_pull_image_and_run.py"
+python3 "${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/dind_py/main_pull_image_and_run.py"
 
 # The following script is responsible for creating packages and nightly builds
 # which do not need to run inside Cobalt containers.

diff --git a/cobalt/devinfra/kokoro/bin/lint.sh b/cobalt/devinfra/kokoro/bin/lint.sh
@@ -7,7 +7,7 @@ set -ux
 WORKSPACE_COBALT="${KOKORO_ARTIFACTS_DIR}/git/src"
 
 ### Clean up workspace on exit or error.
-trap "bash ${WORKSPACE_COBALT}/internal/kokoro/bin/cleanup.sh" EXIT INT TERM
+trap "bash ${WORKSPACE_COBALT}/cobalt/devinfra/kokoro/bin/cleanup.sh" EXIT INT TERM
 
 configure_environment
 

diff --git a/cobalt/devinfra/kokoro/build/android/arm/common.gcl b/cobalt/devinfra/kokoro/build/android/arm/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'EXTRA_GN_ARGUMENTS'

diff --git a/cobalt/devinfra/kokoro/build/android/arm/qa.gcl b/cobalt/devinfra/kokoro/build/android/arm/qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/android/arm64/common.gcl b/cobalt/devinfra/kokoro/build/android/arm64/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'EXTRA_GN_ARGUMENTS'

diff --git a/cobalt/devinfra/kokoro/build/android/arm64/qa.gcl b/cobalt/devinfra/kokoro/build/android/arm64/qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/android/x86/common.gcl b/cobalt/devinfra/kokoro/build/android/x86/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'EXTRA_GN_ARGUMENTS'

diff --git a/cobalt/devinfra/kokoro/build/android/x86/qa.gcl b/cobalt/devinfra/kokoro/build/android/x86/qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm-hardfp/common.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm-hardfp/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'BOOTLOADER'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm-hardfp/sbversion-17_gold.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm-hardfp/sbversion-17_gold.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm-hardfp/sbversion-17_qa.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm-hardfp/sbversion-17_qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm-softfp/common.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm-softfp/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'BOOTLOADER'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm-softfp/sbversion-17_gold.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm-softfp/sbversion-17_gold.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm-softfp/sbversion-17_qa.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm-softfp/sbversion-17_qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm64/common.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm64/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'EXTRA_GN_ARGUMENTS'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm64/sbversion-17_gold.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm64/sbversion-17_gold.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/arm64/sbversion-17_qa.gcl b/cobalt/devinfra/kokoro/build/evergreen/arm64/sbversion-17_qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/x64/common.gcl b/cobalt/devinfra/kokoro/build/evergreen/x64/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'BOOTLOADER'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/x64/sbversion-17_gold.gcl b/cobalt/devinfra/kokoro/build/evergreen/x64/sbversion-17_gold.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/evergreen/x64/sbversion-17_qa.gcl b/cobalt/devinfra/kokoro/build/evergreen/x64/sbversion-17_qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/linux/grtev5/common.gcl b/cobalt/devinfra/kokoro/build/linux/grtev5/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'EXTRA_GN_ARGUMENTS'

diff --git a/cobalt/devinfra/kokoro/build/linux/grtev5/qa.gcl b/cobalt/devinfra/kokoro/build/linux/grtev5/qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/build/linux/internal/common.gcl b/cobalt/devinfra/kokoro/build/linux/internal/common.gcl
@@ -5,7 +5,7 @@
 import '../../common.gcl' as common
 
 build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'EXTRA_GN_ARGUMENTS'

diff --git a/cobalt/devinfra/kokoro/build/linux/internal/qa.gcl b/cobalt/devinfra/kokoro/build/linux/internal/qa.gcl
@@ -6,7 +6,7 @@
 import 'common.gcl' as common
 
 config build = common.build {
-  build_file = 'src/internal/kokoro/bin/dind_builder_runner.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/dind_builder_runner.sh'
   env_vars = super.env_vars + [
     {
       key = 'CONFIG'

diff --git a/cobalt/devinfra/kokoro/lint/presubmit.gcl b/cobalt/devinfra/kokoro/lint/presubmit.gcl
@@ -4,7 +4,7 @@
 // validation: gcl --message=kokoro.BuildConfig --objtype=config group2.gcl appendascii
 
 config build = {
-  build_file = 'src/internal/kokoro/bin/lint.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/lint.sh'
   env_vars = [
     {
       key = 'GN_HASH'

diff --git a/cobalt/devinfra/kokoro/odt/common.gcl b/cobalt/devinfra/kokoro/odt/common.gcl
@@ -3,7 +3,7 @@
 // proto-message: BuildConfig
 
 build = {
-  build_file = 'src/internal/kokoro/bin/on_device_test.sh'
+  build_file = 'src/cobalt/devinfra/kokoro/bin/on_device_test.sh'
   before_action = [
     {
       invoke_blaze = {

diff --git a/cobalt/devinfra/kokoro/third-party/mac/brew/README.txt b/cobalt/devinfra/kokoro/third-party/mac/brew/README.txt
@@ -10,7 +10,7 @@ Follow these direction to add new package:
 
 1. Configure your MacOS jobs to run on MACOS_EXTERNAL cluster. This will allow to
 download and install packages from the web.
-2. Add the following to internal/kokoro/bin/build_mac.sh and make CL:
+2. Add the following to cobalt/devinfra/kokoro/bin/build_mac.sh and make CL:
 
 +HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_INSTALL_FROM_API=1 \
   brew install sccache