Merge branch 'andrew/organize-bare-metal-deployment' into 'master'

Chore(NODE-1393): Move bare_metal_deploy to dev-tools/ See merge request dfinity-lab/public/ic!19622
dfinity · Jun 3, 2024 · 866f631 · 866f631
2 parents 8f0d70a + c8dd895
commit 866f631
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml
@@ -92,7 +92,7 @@ jobs:
           # shellcheck disable=SC2046,SC2086
           bazel ${BAZEL_STARTUP_ARGS} run ${BAZEL_CI_CONFIG} \
             //ic-os/setupos/envs/dev:launch_bare_metal -- \
-              --config_path "$(realpath  ./ic-os/utils/bare_metal_deployment/zh2-dll01.yaml)" \
+              --config_path "$(realpath  ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \
               --csv_filename "$(realpath file1)" \
               --file_share_ssh_key "$(realpath file2)" \
               --file_share_username ci_interim \

diff --git a/gitlab-ci/config/main.yml b/gitlab-ci/config/main.yml
@@ -594,7 +594,7 @@ bazel-test-bare-metal:
       # shellcheck disable=SC2046,SC2086
       bazel ${BAZEL_STARTUP_ARGS} run ${BAZEL_CI_CONFIG} \
         //ic-os/setupos/envs/dev:launch_bare_metal -- \
-          --config_path "$(realpath  ./ic-os/scripts/bare_metal_deployment/zh2-dll01.yaml)" \
+          --config_path "$(realpath  ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \
           --csv_filename "$(realpath "$ZH2_DLL01_CSV_SECRETS_PATH")" \
           --file_share_ssh_key "$(realpath "$ZH2_FILE_SHARE_KEY_PATH")" \
           --file_share_username ci_interim \

diff --git a/gitlab-ci/config/zz-generated-gitlab-ci.yaml b/gitlab-ci/config/zz-generated-gitlab-ci.yaml
@@ -1155,7 +1155,7 @@ bazel-test-bare-metal:
       # shellcheck disable=SC2046,SC2086
       bazel ${BAZEL_STARTUP_ARGS} run ${BAZEL_CI_CONFIG} \
         //ic-os/setupos/envs/dev:launch_bare_metal -- \
-          --config_path "$(realpath  ./ic-os/scripts/bare_metal_deployment/zh2-dll01.yaml)" \
+          --config_path "$(realpath  ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \
           --csv_filename "$(realpath "$ZH2_DLL01_CSV_SECRETS_PATH")" \
           --file_share_ssh_key "$(realpath "$ZH2_FILE_SHARE_KEY_PATH")" \
           --file_share_username ci_interim \

diff --git a/...scripts/bare_metal_deployment/BUILD.bazel → ...v-tools/bare_metal_deployment/BUILD.bazel b/...scripts/bare_metal_deployment/BUILD.bazel → ...v-tools/bare_metal_deployment/BUILD.bazel
diff --git a/...s/scripts/bare_metal_deployment/README.md → ...dev-tools/bare_metal_deployment/README.md b/...s/scripts/bare_metal_deployment/README.md → ...dev-tools/bare_metal_deployment/README.md
@@ -21,7 +21,7 @@ The config files must be accessible from inside the container - e.g., at the roo
 
 ```bash
 bazel run //ic-os/setupos/envs/dev:launch_bare_metal --config=local -- \
-    --config_path $(realpath ./ic-os/scripts/bare_metal_deployment/zh2-dll01.yaml) \
+    --config_path $(realpath ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml) \
     --csv_filename $(realpath ./zh2-dll01.csv)
 ```
 
@@ -30,7 +30,7 @@ If your current username does not match the username used to log into the file s
 bazel run //ic-os/setupos/envs/dev:launch_bare_metal --config=local -- \
     --file_share_username <your username per infrasec> \
     # --file_share_ssh_key <custom ssh private key> # Specify if a special ssh key is needed \
-    --config_path $(realpath ./ic-os/scripts/bare_metal_deployment/zh2-dll01.yaml) \
+    --config_path $(realpath ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml) \
     --csv_filename $(realpath ./zh2-dll01.csv)
 ```
 

diff --git a/...s/scripts/bare_metal_deployment/deploy.py → ...dev-tools/bare_metal_deployment/deploy.py b/...s/scripts/bare_metal_deployment/deploy.py → ...dev-tools/bare_metal_deployment/deploy.py
diff --git a/...ipts/bare_metal_deployment/pyproject.toml → ...ools/bare_metal_deployment/pyproject.toml b/...ipts/bare_metal_deployment/pyproject.toml → ...ools/bare_metal_deployment/pyproject.toml
diff --git a/...s/scripts/bare_metal_deployment/tools.bzl → ...dev-tools/bare_metal_deployment/tools.bzl b/...s/scripts/bare_metal_deployment/tools.bzl → ...dev-tools/bare_metal_deployment/tools.bzl
@@ -7,8 +7,8 @@ load("@python_deps//:requirements.bzl", "requirement")
 def launch_bare_metal(name, image_zst_file):
     native.py_binary(
         name = name,
-        srcs = ["//ic-os/scripts/bare_metal_deployment:deploy.py"],
-        main = "//ic-os/scripts/bare_metal_deployment:deploy.py",
+        srcs = ["//ic-os/dev-tools/bare_metal_deployment:deploy.py"],
+        main = "//ic-os/dev-tools/bare_metal_deployment:deploy.py",
         deps = [
             requirement("fabric"),
             requirement("icmplib"),
@@ -20,14 +20,14 @@ def launch_bare_metal(name, image_zst_file):
             requirement("simple-parsing"),
             requirement("tqdm"),
         ],
-        data = [image_zst_file, "//rs/ic_os/setupos-inject-configuration", "//ic-os/scripts/bare_metal_deployment:find_idrac_package_path"],
+        data = [image_zst_file, "//rs/ic_os/setupos-inject-configuration", "//ic-os/dev-tools/bare_metal_deployment:find_idrac_package_path"],
         args = [
             "--inject_configuration_tool",
             "$(location //rs/ic_os/setupos-inject-configuration)",
             "--upload_img",
             "$(location " + image_zst_file + ")",
             "--idrac_script_dir",
-            "$(location //ic-os/scripts/bare_metal_deployment:find_idrac_package_path)",
+            "$(location //ic-os/dev-tools/bare_metal_deployment:find_idrac_package_path)",
         ],
         tags = ["manual"],
     )
diff --git a/...ipts/bare_metal_deployment/zh2-dll01.yaml → ...ools/bare_metal_deployment/zh2-dll01.yaml b/...ipts/bare_metal_deployment/zh2-dll01.yaml → ...ools/bare_metal_deployment/zh2-dll01.yaml
diff --git a/ic-os/setupos/envs/dev/BUILD.bazel b/ic-os/setupos/envs/dev/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//ic-os:defs.bzl", "icos_build")
-load("//ic-os/scripts/bare_metal_deployment:tools.bzl", "launch_bare_metal")
+load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal")
 load("//ic-os/setupos:defs.bzl", "image_deps")
 
 exports_files(["build_container_filesystem_config.txt"])

diff --git a/ic-os/setupos/envs/local-base-dev/BUILD.bazel b/ic-os/setupos/envs/local-base-dev/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//ic-os:defs.bzl", "icos_build")
-load("//ic-os/scripts/bare_metal_deployment:tools.bzl", "launch_bare_metal")
+load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal")
 load("//ic-os/setupos:defs.bzl", "image_deps")
 
 exports_files(["build_container_filesystem_config.txt"])

diff --git a/ic-os/setupos/envs/local-base-prod/BUILD.bazel b/ic-os/setupos/envs/local-base-prod/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//ic-os:defs.bzl", "icos_build")
-load("//ic-os/scripts/bare_metal_deployment:tools.bzl", "launch_bare_metal")
+load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal")
 load("//ic-os/setupos:defs.bzl", "image_deps")
 
 exports_files(["build_container_filesystem_config.txt"])

diff --git a/ic-os/setupos/envs/prod/BUILD.bazel b/ic-os/setupos/envs/prod/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//ic-os:defs.bzl", "icos_build")
-load("//ic-os/scripts/bare_metal_deployment:tools.bzl", "launch_bare_metal")
+load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal")
 load("//ic-os/setupos:defs.bzl", "image_deps")
 
 exports_files(["build_container_filesystem_config.txt"])