From fe6f4a8bd3509b809e318330cb22b50758c42d3a Mon Sep 17 00:00:00 2001 From: Andrew Battat <113942931+andrewbattat@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:53:50 -0500 Subject: [PATCH] fix: comment out broken launch bare metal target (#1980) Test broken after https://github.com/dfinity/ic/pull/1959 Fix redfish dependency after https://github.com/dfinity/ic/pull/1959 Full context: https://dfinity.slack.com/archives/C026JQ1B2AF/p1728578113038139 --------- Co-authored-by: IDX GitHub Automation --- .github/workflows-source/schedule-daily.yml | 86 ++++++++-------- .github/workflows/schedule-daily.yml | 99 ++++++++----------- ic-os/setupos/envs/dev/BUILD.bazel | 11 ++- ic-os/setupos/envs/local-base-dev/BUILD.bazel | 11 ++- .../setupos/envs/local-base-prod/BUILD.bazel | 11 ++- ic-os/setupos/envs/prod/BUILD.bazel | 11 ++- 6 files changed, 110 insertions(+), 119 deletions(-) diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml index 1cc42d9ae764..5cc9a4e9ba38 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 diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml index 44abb8891d13..f7d3ca50d256 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: diff --git a/ic-os/setupos/envs/dev/BUILD.bazel b/ic-os/setupos/envs/dev/BUILD.bazel index df8f2a35deb0..743416842d10 100644 --- a/ic-os/setupos/envs/dev/BUILD.bazel +++ b/ic-os/setupos/envs/dev/BUILD.bazel @@ -1,5 +1,6 @@ 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", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. @@ -19,7 +20,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 12ca12c676f6..6ac6ac849a59 100644 --- a/ic-os/setupos/envs/local-base-dev/BUILD.bazel +++ b/ic-os/setupos/envs/local-base-dev/BUILD.bazel @@ -1,5 +1,6 @@ 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", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. @@ -18,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-prod/BUILD.bazel b/ic-os/setupos/envs/local-base-prod/BUILD.bazel index 3b564fe85833..f7e6b6268c3e 100644 --- a/ic-os/setupos/envs/local-base-prod/BUILD.bazel +++ b/ic-os/setupos/envs/local-base-prod/BUILD.bazel @@ -1,5 +1,6 @@ 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", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. @@ -16,7 +17,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 53f67a4d529f..cc25f34ce17c 100644 --- a/ic-os/setupos/envs/prod/BUILD.bazel +++ b/ic-os/setupos/envs/prod/BUILD.bazel @@ -1,5 +1,6 @@ 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", "launch_bare_metal") load("//ic-os/setupos:defs.bzl", "image_deps") # The macro contains several targets. @@ -14,7 +15,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", +# )