From ae82638614134d33b43497950720b5074f826d81 Mon Sep 17 00:00:00 2001 From: Andrew Battat Date: Thu, 10 Oct 2024 19:12:49 +0000 Subject: [PATCH 1/8] Fix redfish dependency --- WORKSPACE.bazel | 8 ++++++++ ic-os/dev-tools/bare_metal_deployment/tools.bzl | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 3b354ee624e..7a56319b689 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -500,6 +500,14 @@ http_file( url = "https://github.com/dfinity/sdk/raw/0.14.2/src/distributed/assetstorage.wasm.gz", ) +# VirtualDisk FOO +http_file( + name = "VirtualDiskExpansionREDFISH.py", + downloaded_file_path = "VirtualDiskExpansionREDFISH.py", + sha256 = "28985dd59a0d1c37131c2498855ee331395be25cb4bb87707dce669b4958163d", + url = "https://raw.githubusercontent.com/dell/iDRAC-Redfish-Scripting/refs/heads/master/Redfish%20Python/VirtualDiskExpansionREDFISH.py", +) + # Old version of wallet canister http_file( diff --git a/ic-os/dev-tools/bare_metal_deployment/tools.bzl b/ic-os/dev-tools/bare_metal_deployment/tools.bzl index bef40135eec..a83a40de854 100644 --- a/ic-os/dev-tools/bare_metal_deployment/tools.bzl +++ b/ic-os/dev-tools/bare_metal_deployment/tools.bzl @@ -35,7 +35,7 @@ def launch_bare_metal(name, image_zst_file): "--upload_img", "$(location " + image_zst_file + ")", "--idrac_script", - "$(location @python_deps_idracredfishsupport//:IdracRedfishSupport-0.0.8.data/scripts/VirtualDiskExpansionREDFISH.py)", + "$(rootpath @VirtualDiskExpansionREDFISH.py//file)", "--benchmark_driver_script", "$(location //ic-os/dev-tools/bare_metal_deployment:benchmark_driver.sh)", "--benchmark_runner_script", @@ -48,7 +48,7 @@ def launch_bare_metal(name, image_zst_file): ":" + binary_name, image_zst_file, "//rs/ic_os/dev_test_tools/setupos-inject-configuration", - "@python_deps_idracredfishsupport//:IdracRedfishSupport-0.0.8.data/scripts/VirtualDiskExpansionREDFISH.py", + "@VirtualDiskExpansionREDFISH.py//file", "//ic-os/dev-tools/bare_metal_deployment:benchmark_runner.sh", "//ic-os/dev-tools/bare_metal_deployment:benchmark_driver.sh", "//ic-os/dev-tools/hw_validation:stress.sh", From fc5cb195a388925d4afe454b0fc3286e91d6cb92 Mon Sep 17 00:00:00 2001 From: Andrew Battat Date: Thu, 10 Oct 2024 19:19:32 +0000 Subject: [PATCH 2/8] Comment out launch_bare_metal target --- ic-os/setupos/envs/dev/BUILD.bazel | 8 ++++---- ic-os/setupos/envs/local-base-dev/BUILD.bazel | 8 ++++---- ic-os/setupos/envs/local-base-prod/BUILD.bazel | 8 ++++---- ic-os/setupos/envs/prod/BUILD.bazel | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ic-os/setupos/envs/dev/BUILD.bazel b/ic-os/setupos/envs/dev/BUILD.bazel index df8f2a35deb..dd76ca314b9 100644 --- a/ic-os/setupos/envs/dev/BUILD.bazel +++ b/ic-os/setupos/envs/dev/BUILD.bazel @@ -19,7 +19,7 @@ icos_build( vuln_scan = False, ) -launch_bare_metal( - name = "launch_bare_metal", - image_zst_file = ":disk-img.tar.zst", -) +# launch_bare_metal( +# name = "launch_bare_metal", +# image_zst_file = ":disk-img.tar.zst", +# ) diff --git a/ic-os/setupos/envs/local-base-dev/BUILD.bazel b/ic-os/setupos/envs/local-base-dev/BUILD.bazel index 12ca12c676f..da1661d4c6c 100644 --- a/ic-os/setupos/envs/local-base-dev/BUILD.bazel +++ b/ic-os/setupos/envs/local-base-dev/BUILD.bazel @@ -18,7 +18,7 @@ icos_build( vuln_scan = False, ) -launch_bare_metal( - name = "launch_bare_metal", - image_zst_file = ":disk-img.tar.zst", -) +# launch_bare_metal( +# name = "launch_bare_metal", +# image_zst_file = ":disk-img.tar.zst", +# ) diff --git a/ic-os/setupos/envs/local-base-prod/BUILD.bazel b/ic-os/setupos/envs/local-base-prod/BUILD.bazel index 3b564fe8583..e9ccad71821 100644 --- a/ic-os/setupos/envs/local-base-prod/BUILD.bazel +++ b/ic-os/setupos/envs/local-base-prod/BUILD.bazel @@ -16,7 +16,7 @@ icos_build( vuln_scan = False, ) -launch_bare_metal( - name = "launch_bare_metal", - image_zst_file = ":disk-img.tar.zst", -) +# launch_bare_metal( +# name = "launch_bare_metal", +# image_zst_file = ":disk-img.tar.zst", +# ) diff --git a/ic-os/setupos/envs/prod/BUILD.bazel b/ic-os/setupos/envs/prod/BUILD.bazel index 53f67a4d529..72cd13509c1 100644 --- a/ic-os/setupos/envs/prod/BUILD.bazel +++ b/ic-os/setupos/envs/prod/BUILD.bazel @@ -14,7 +14,7 @@ icos_build( vuln_scan = False, ) -launch_bare_metal( - name = "launch_bare_metal", - image_zst_file = ":disk-img.tar.zst", -) +# launch_bare_metal( +# name = "launch_bare_metal", +# image_zst_file = ":disk-img.tar.zst", +# ) From 1919f30815abedd3e7c445acf8c70e16fad2e703 Mon Sep 17 00:00:00 2001 From: Andrew Battat Date: Thu, 10 Oct 2024 19:20:42 +0000 Subject: [PATCH 3/8] Revert "Fix redfish dependency" This reverts commit ae82638614134d33b43497950720b5074f826d81. --- WORKSPACE.bazel | 8 -------- ic-os/dev-tools/bare_metal_deployment/tools.bzl | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 7a56319b689..3b354ee624e 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -500,14 +500,6 @@ http_file( url = "https://github.com/dfinity/sdk/raw/0.14.2/src/distributed/assetstorage.wasm.gz", ) -# VirtualDisk FOO -http_file( - name = "VirtualDiskExpansionREDFISH.py", - downloaded_file_path = "VirtualDiskExpansionREDFISH.py", - sha256 = "28985dd59a0d1c37131c2498855ee331395be25cb4bb87707dce669b4958163d", - url = "https://raw.githubusercontent.com/dell/iDRAC-Redfish-Scripting/refs/heads/master/Redfish%20Python/VirtualDiskExpansionREDFISH.py", -) - # Old version of wallet canister http_file( diff --git a/ic-os/dev-tools/bare_metal_deployment/tools.bzl b/ic-os/dev-tools/bare_metal_deployment/tools.bzl index a83a40de854..bef40135eec 100644 --- a/ic-os/dev-tools/bare_metal_deployment/tools.bzl +++ b/ic-os/dev-tools/bare_metal_deployment/tools.bzl @@ -35,7 +35,7 @@ def launch_bare_metal(name, image_zst_file): "--upload_img", "$(location " + image_zst_file + ")", "--idrac_script", - "$(rootpath @VirtualDiskExpansionREDFISH.py//file)", + "$(location @python_deps_idracredfishsupport//:IdracRedfishSupport-0.0.8.data/scripts/VirtualDiskExpansionREDFISH.py)", "--benchmark_driver_script", "$(location //ic-os/dev-tools/bare_metal_deployment:benchmark_driver.sh)", "--benchmark_runner_script", @@ -48,7 +48,7 @@ def launch_bare_metal(name, image_zst_file): ":" + binary_name, image_zst_file, "//rs/ic_os/dev_test_tools/setupos-inject-configuration", - "@VirtualDiskExpansionREDFISH.py//file", + "@python_deps_idracredfishsupport//:IdracRedfishSupport-0.0.8.data/scripts/VirtualDiskExpansionREDFISH.py", "//ic-os/dev-tools/bare_metal_deployment:benchmark_runner.sh", "//ic-os/dev-tools/bare_metal_deployment:benchmark_driver.sh", "//ic-os/dev-tools/hw_validation:stress.sh", From 4d6adf7775adad41c6ba4161cb97608186edf4e3 Mon Sep 17 00:00:00 2001 From: Andrew Battat Date: Thu, 10 Oct 2024 19:23:30 +0000 Subject: [PATCH 4/8] Fix buildifier --- ic-os/setupos/envs/dev/BUILD.bazel | 2 +- ic-os/setupos/envs/local-base-dev/BUILD.bazel | 2 +- ic-os/setupos/envs/local-base-prod/BUILD.bazel | 2 +- ic-os/setupos/envs/prod/BUILD.bazel | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ic-os/setupos/envs/dev/BUILD.bazel b/ic-os/setupos/envs/dev/BUILD.bazel index dd76ca314b9..e55a7825f2c 100644 --- 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/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") +load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. diff --git a/ic-os/setupos/envs/local-base-dev/BUILD.bazel b/ic-os/setupos/envs/local-base-dev/BUILD.bazel index da1661d4c6c..3beee230d00 100644 --- 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/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") +load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. diff --git a/ic-os/setupos/envs/local-base-prod/BUILD.bazel b/ic-os/setupos/envs/local-base-prod/BUILD.bazel index e9ccad71821..19b4b921b94 100644 --- 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/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") +load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. diff --git a/ic-os/setupos/envs/prod/BUILD.bazel b/ic-os/setupos/envs/prod/BUILD.bazel index 72cd13509c1..a7335aa7d08 100644 --- 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/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") +load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. From ad0b64331c0281291194e6a804e4f53808bc71cb Mon Sep 17 00:00:00 2001 From: Andrew Battat Date: Thu, 10 Oct 2024 19:27:33 +0000 Subject: [PATCH 5/8] Fix buildifier --- ic-os/setupos/envs/dev/BUILD.bazel | 2 +- ic-os/setupos/envs/local-base-dev/BUILD.bazel | 2 +- ic-os/setupos/envs/local-base-prod/BUILD.bazel | 2 +- ic-os/setupos/envs/prod/BUILD.bazel | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ic-os/setupos/envs/dev/BUILD.bazel b/ic-os/setupos/envs/dev/BUILD.bazel index e55a7825f2c..93ea794e5b0 100644 --- 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/dev-tools/bare_metal_deployment:tools.bzl") +#load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. diff --git a/ic-os/setupos/envs/local-base-dev/BUILD.bazel b/ic-os/setupos/envs/local-base-dev/BUILD.bazel index 3beee230d00..064ab439406 100644 --- 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/dev-tools/bare_metal_deployment:tools.bzl") +#load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. diff --git a/ic-os/setupos/envs/local-base-prod/BUILD.bazel b/ic-os/setupos/envs/local-base-prod/BUILD.bazel index 19b4b921b94..43f894a5538 100644 --- 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/dev-tools/bare_metal_deployment:tools.bzl") +#load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. diff --git a/ic-os/setupos/envs/prod/BUILD.bazel b/ic-os/setupos/envs/prod/BUILD.bazel index a7335aa7d08..2cf1f52685a 100644 --- 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/dev-tools/bare_metal_deployment:tools.bzl") +#load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. From 606626acd2b9ad473f3e39f656f7655c04443140 Mon Sep 17 00:00:00 2001 From: Andrew Battat Date: Thu, 10 Oct 2024 19:31:23 +0000 Subject: [PATCH 6/8] Fix buildifier --- ic-os/setupos/envs/dev/BUILD.bazel | 1 + ic-os/setupos/envs/local-base-dev/BUILD.bazel | 1 + ic-os/setupos/envs/local-base-prod/BUILD.bazel | 1 + ic-os/setupos/envs/prod/BUILD.bazel | 1 + 4 files changed, 4 insertions(+) diff --git a/ic-os/setupos/envs/dev/BUILD.bazel b/ic-os/setupos/envs/dev/BUILD.bazel index 93ea794e5b0..743416842d1 100644 --- a/ic-os/setupos/envs/dev/BUILD.bazel +++ b/ic-os/setupos/envs/dev/BUILD.bazel @@ -1,4 +1,5 @@ load("//ic-os:defs.bzl", "icos_build") + #load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") diff --git a/ic-os/setupos/envs/local-base-dev/BUILD.bazel b/ic-os/setupos/envs/local-base-dev/BUILD.bazel index 064ab439406..6ac6ac849a5 100644 --- a/ic-os/setupos/envs/local-base-dev/BUILD.bazel +++ b/ic-os/setupos/envs/local-base-dev/BUILD.bazel @@ -1,4 +1,5 @@ load("//ic-os:defs.bzl", "icos_build") + #load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") diff --git a/ic-os/setupos/envs/local-base-prod/BUILD.bazel b/ic-os/setupos/envs/local-base-prod/BUILD.bazel index 43f894a5538..f7e6b6268c3 100644 --- a/ic-os/setupos/envs/local-base-prod/BUILD.bazel +++ b/ic-os/setupos/envs/local-base-prod/BUILD.bazel @@ -1,4 +1,5 @@ load("//ic-os:defs.bzl", "icos_build") + #load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") diff --git a/ic-os/setupos/envs/prod/BUILD.bazel b/ic-os/setupos/envs/prod/BUILD.bazel index 2cf1f52685a..cc25f34ce17 100644 --- a/ic-os/setupos/envs/prod/BUILD.bazel +++ b/ic-os/setupos/envs/prod/BUILD.bazel @@ -1,4 +1,5 @@ load("//ic-os:defs.bzl", "icos_build") + #load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") From d8e0b0a338324e7a123bc6f52bd8b7bc7ea9ac93 Mon Sep 17 00:00:00 2001 From: Andrew Battat Date: Thu, 10 Oct 2024 19:34:20 +0000 Subject: [PATCH 7/8] Comment out nightly bare-metal test --- .github/workflows-source/schedule-daily.yml | 86 ++++++++++----------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml index 1cc42d9ae76..5cc9a4e9ba3 100644 --- a/.github/workflows-source/schedule-daily.yml +++ b/.github/workflows-source/schedule-daily.yml @@ -63,51 +63,51 @@ anchors: jobs: - bazel-test-bare-metal: - name: Bazel Test Bare Metal - <<: *dind-large-setup - timeout-minutes: 120 - runs-on: - group: zh1 - labels: dind-large - steps: - - <<: *checkout - - <<: *before-script - - <<: *docker-login - - name: Run Bazel Launch Bare Metal - shell: bash - run: | - echo "$ZH2_DLL01_CSV_SECRETS" > file1 - echo "$ZH2_FILE_SHARE_KEY" > file2 && chmod 400 file2 + # bazel-test-bare-metal: + # name: Bazel Test Bare Metal + # <<: *dind-large-setup + # timeout-minutes: 120 + # runs-on: + # group: zh1 + # labels: dind-large + # steps: + # - <<: *checkout + # - <<: *before-script + # - <<: *docker-login + # - name: Run Bazel Launch Bare Metal + # shell: bash + # run: | + # echo "$ZH2_DLL01_CSV_SECRETS" > file1 + # echo "$ZH2_FILE_SHARE_KEY" > file2 && chmod 400 file2 - # Run bare metal installation test - # 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/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \ - --csv_filename "$(realpath file1)" \ - --file_share_ssh_key "$(realpath file2)" \ - --inject_image_pub_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3gjE/2K5nxIBbk3ohgs8J5LW+XiObwA+kGtSaF5+4c" \ - --file_share_username ci_interim \ - --ci_mode + # # Run bare metal installation test + # # 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/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \ + # --csv_filename "$(realpath file1)" \ + # --file_share_ssh_key "$(realpath file2)" \ + # --inject_image_pub_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3gjE/2K5nxIBbk3ohgs8J5LW+XiObwA+kGtSaF5+4c" \ + # --file_share_username ci_interim \ + # --ci_mode - # Run bare metal node performance benchmarks - # 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/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \ - --csv_filename "$(realpath file1)" \ - --file_share_ssh_key "$(realpath file2)" \ - --inject_image_pub_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3gjE/2K5nxIBbk3ohgs8J5LW+XiObwA+kGtSaF5+4c" \ - --file_share_username ci_interim \ - --ci_mode \ - --benchmark - bazel clean - env: - BAZEL_STARTUP_ARGS: "--output_base=/var/tmp/bazel-output/" - BAZEL_CI_CONFIG: "--config=ci --repository_cache=/cache/bazel" - ZH2_DLL01_CSV_SECRETS: "${{ secrets.ZH2_DLL01_CSV_SECRETS }}" - ZH2_FILE_SHARE_KEY: "${{ secrets.ZH2_FILE_SHARE_KEY }}" + # # Run bare metal node performance benchmarks + # # 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/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \ + # --csv_filename "$(realpath file1)" \ + # --file_share_ssh_key "$(realpath file2)" \ + # --inject_image_pub_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3gjE/2K5nxIBbk3ohgs8J5LW+XiObwA+kGtSaF5+4c" \ + # --file_share_username ci_interim \ + # --ci_mode \ + # --benchmark + # bazel clean + # env: + # BAZEL_STARTUP_ARGS: "--output_base=/var/tmp/bazel-output/" + # BAZEL_CI_CONFIG: "--config=ci --repository_cache=/cache/bazel" + # ZH2_DLL01_CSV_SECRETS: "${{ secrets.ZH2_DLL01_CSV_SECRETS }}" + # ZH2_FILE_SHARE_KEY: "${{ secrets.ZH2_FILE_SHARE_KEY }}" fi-tests-nightly: name: Bazel Test FI Nightly From a613168c1c95ac8ffb539689a244f83cabb37e3e Mon Sep 17 00:00:00 2001 From: IDX GitHub Automation Date: Thu, 10 Oct 2024 19:35:02 +0000 Subject: [PATCH 8/8] IDX GitHub Automation --- .github/workflows/schedule-daily.yml | 99 ++++++++++++---------------- 1 file changed, 43 insertions(+), 56 deletions(-) diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml index 44abb8891d1..f7d3ca50d25 100644 --- a/.github/workflows/schedule-daily.yml +++ b/.github/workflows/schedule-daily.yml @@ -14,64 +14,51 @@ env: CI_RUN_ID: ${{ github.run_id }} BUILDEVENT_DATASET: "github-ci-dfinity" jobs: - bazel-test-bare-metal: - name: Bazel Test Bare Metal - container: - image: ghcr.io/dfinity/ic-build@sha256:2c6fc0aa92ada647e42790cbdac3199b27a1407d9e90ff6e5a97a69acac24041 - options: >- - -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp - timeout-minutes: 120 - runs-on: - group: zh1 - labels: dind-large - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Before script - id: before-script - shell: bash - run: | - [ -n "${NODE_NAME:-}" ] && echo "Node: $NODE_NAME" - - name: Login to Dockerhub - shell: bash - run: ./ci/scripts/docker-login.sh - env: - DOCKER_HUB_USER: ${{ vars.DOCKER_HUB_USER }} - DOCKER_HUB_PASSWORD_RO: ${{ secrets.DOCKER_HUB_PASSWORD_RO }} - - name: Run Bazel Launch Bare Metal - shell: bash - run: | - echo "$ZH2_DLL01_CSV_SECRETS" > file1 - echo "$ZH2_FILE_SHARE_KEY" > file2 && chmod 400 file2 + # bazel-test-bare-metal: + # name: Bazel Test Bare Metal + # <<: *dind-large-setup + # timeout-minutes: 120 + # runs-on: + # group: zh1 + # labels: dind-large + # steps: + # - <<: *checkout + # - <<: *before-script + # - <<: *docker-login + # - name: Run Bazel Launch Bare Metal + # shell: bash + # run: | + # echo "$ZH2_DLL01_CSV_SECRETS" > file1 + # echo "$ZH2_FILE_SHARE_KEY" > file2 && chmod 400 file2 - # Run bare metal installation test - # 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/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \ - --csv_filename "$(realpath file1)" \ - --file_share_ssh_key "$(realpath file2)" \ - --inject_image_pub_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3gjE/2K5nxIBbk3ohgs8J5LW+XiObwA+kGtSaF5+4c" \ - --file_share_username ci_interim \ - --ci_mode + # # Run bare metal installation test + # # 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/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \ + # --csv_filename "$(realpath file1)" \ + # --file_share_ssh_key "$(realpath file2)" \ + # --inject_image_pub_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3gjE/2K5nxIBbk3ohgs8J5LW+XiObwA+kGtSaF5+4c" \ + # --file_share_username ci_interim \ + # --ci_mode - # Run bare metal node performance benchmarks - # 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/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \ - --csv_filename "$(realpath file1)" \ - --file_share_ssh_key "$(realpath file2)" \ - --inject_image_pub_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3gjE/2K5nxIBbk3ohgs8J5LW+XiObwA+kGtSaF5+4c" \ - --file_share_username ci_interim \ - --ci_mode \ - --benchmark - bazel clean - env: - BAZEL_STARTUP_ARGS: "--output_base=/var/tmp/bazel-output/" - BAZEL_CI_CONFIG: "--config=ci --repository_cache=/cache/bazel" - ZH2_DLL01_CSV_SECRETS: "${{ secrets.ZH2_DLL01_CSV_SECRETS }}" - ZH2_FILE_SHARE_KEY: "${{ secrets.ZH2_FILE_SHARE_KEY }}" + # # Run bare metal node performance benchmarks + # # 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/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \ + # --csv_filename "$(realpath file1)" \ + # --file_share_ssh_key "$(realpath file2)" \ + # --inject_image_pub_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3gjE/2K5nxIBbk3ohgs8J5LW+XiObwA+kGtSaF5+4c" \ + # --file_share_username ci_interim \ + # --ci_mode \ + # --benchmark + # bazel clean + # env: + # BAZEL_STARTUP_ARGS: "--output_base=/var/tmp/bazel-output/" + # BAZEL_CI_CONFIG: "--config=ci --repository_cache=/cache/bazel" + # ZH2_DLL01_CSV_SECRETS: "${{ secrets.ZH2_DLL01_CSV_SECRETS }}" + # ZH2_FILE_SHARE_KEY: "${{ secrets.ZH2_FILE_SHARE_KEY }}" fi-tests-nightly: name: Bazel Test FI Nightly runs-on: