Merge branch 'levsha/-IDX-2606-Use-the-image-from-bazel-cache-for-scalability-tests-' into 'master'

[IDX-2606]: Use the image from bazel cache for scalability tests.

The change will decrease usage of s3 and will make scalability tests to
be ready for using synthetic ic-os version. 

See merge request dfinity-lab/public/ic!12618

Author: levsha

scalability/BUILD.bazel

@@ -236,8 +236,6 @@ py_binary(
     srcs = ["common/tests/e2e-scalability-tests.py"],
     data = [
         ":artifacts",
-        "//ic-os/guestos/envs/dev:hash_and_upload_update-img",
-        "//ic-os/guestos/envs/dev:hash_and_upload_disk-img",
         "//ic-os:scripts/build-bootstrap-config-image.sh",
         "//rs/tests:create-universal-vm-config-image.sh",
         "common/flamegraph.gz",
@@ -275,11 +273,15 @@ sh_test(
     data = [
         ":e2e-scalability-tests",
         "//ic-os:scripts/build-bootstrap-config-image.sh",
+        "//ic-os/guestos/envs/dev:disk-img.tar.zst.cas-url",
+        "//ic-os/guestos/envs/dev:disk-img.tar.zst.sha256",
         "//ic-os/guestos/envs/dev:version.txt",
     ],
     env = {
         "E2E_TEST_BIN": "$(rootpath :e2e-scalability-tests)",
         "IC_OS_VERSION_FILE": "$(rootpath //ic-os/guestos/envs/dev:version.txt)",
+        "IC_OS_IMAGE_URL": "$(rootpath //ic-os/guestos/envs/dev:disk-img.tar.zst.cas-url)",
+        "IC_OS_IMAGE_SHA256SUM": "$(rootpath //ic-os/guestos/envs/dev:disk-img.tar.zst.sha256)",
     },
     env_inherit = [
         "CI_PROJECT_DIR",

scalability/common/tests/e2e-scalability-tests.py

@@ -20,6 +20,8 @@
 gflags.DEFINE_string("ic_os_version", None, "Version of the guest OS to boot")
 gflags.MarkFlagAsRequired("ic_os_version")
 gflags.DEFINE_string("artifacts_path", "", "Path to the artifacts directory")
+gflags.DEFINE_string("image_url", "", "url of ic-os guestos dev disk image. Constructed from ic_os version if not set.")
+gflags.DEFINE_string("image_sha256sum", "", "sha256 sum of ic-os guestos dev disk image. Constructed from ic_os version if not set.")
 
 
 def run(args):
@@ -41,11 +43,11 @@ def main(argv):
 
     version = farm.Farm.latest_with_disk_image() if FLAGS.ic_os_version == "latest" else FLAGS.ic_os_version
     farm_instance = farm.Farm(FLAGS.artifacts_path, [1, 1], version)
+    image_url = farm.image_url_from_git_commit(version) if FLAGS.image_url is None else FLAGS.image_url
+    image_sha256sum = farm.sha256_for_image(version) if FLAGS.image_sha256sum is None else FLAGS.image_sha256sum
     try:
         farm_instance.create_farm_group()
-        farm_instance.create_vms_from_ic_os_image_via_url(
-            farm.image_url_from_git_commit(version), farm.sha256_for_image(version)
-        )
+        farm_instance.create_vms_from_ic_os_image_via_url(image_url, image_sha256sum)
         farm_instance.prepare_and_register_config_image()
 
         farm_instance.create_prometheus_vm()

scalability/common/tests/e2e-scalability-tests.sh

@@ -17,6 +17,8 @@ fi
 
 exec "${E2E_TEST_BIN}" \
     --ic_os_version "$(cat "${IC_OS_VERSION_FILE}")" \
+    --image_url "$(cat "${IC_OS_IMAGE_URL}")" \
+    --image_sha256sum "$(cat "${IC_OS_IMAGE_SHA256SUM}")" \
     --artifacts_path "scalability/artifacts/release/" \
     --nns_canisters "scalability/artifacts/canisters/" \
     --install_nns_bin "scalability/artifacts/release/ic-nns-init" \