diff --git a/rs/rosetta-api/local/cluster/README.md b/rs/rosetta-api/local/cluster/README.md index ed3368085a50..31412ec42bba 100644 --- a/rs/rosetta-api/local/cluster/README.md +++ b/rs/rosetta-api/local/cluster/README.md @@ -76,11 +76,11 @@ $ ./ci/container/container-run.sh $ bazel build //rs/rosetta-api/icp:rosetta_image.tar # Move the resulting TAR file to a place that can be accessed outside the dev container -$ mv bazel-bin/rs/rosetta-api/icp/rosetta_image.tar /tmp +$ mv bazel-bin/rs/rosetta-api/icp/rosetta_image_tarball/tarball.tar /tmp/rosetta_image.tar # Same for ICRC1 $ bazel build //rs/rosetta-api/icrc1:icrc_rosetta_image.tar -$ mv bazel-bin/rs/rosetta-api/icrc1/icrc_rosetta_image.tar /tmp +$ mv bazel-bin/rs/rosetta-api/icrc1/icrc_rosetta_image_tarball/tarball.tar /tmp/icrc_rosetta_image.tar # Exit the dev container $ exit @@ -102,13 +102,13 @@ Example that deploys local versions for both: Example that deploys local ICRC1 Rosetta with multiple ledgers: ```bash -./deploy.sh --local-icrc1-image-tar ~/workspaces/ic/ic-master/bazel-bin/rs/rosetta-api/icrc1/icrc_rosetta_image.tar --icrc1-ledgers 'lkwrt-vyaaa-aaaaq-aadhq-cai,xsi2v-cyaaa-aaaaq-aabfq-cai' +./deploy.sh --local-icrc1-image-tar ~/workspaces/ic/ic-master/bazel-bin/rs/rosetta-api/icrc1/icrc_rosetta_image_tarball/tarball.tar --icrc1-ledgers 'lkwrt-vyaaa-aaaaq-aadhq-cai,xsi2v-cyaaa-aaaaq-aabfq-cai' ``` Example that deploys **only** your local ICRC1 Rosetta build (skipping the latest image): ```bash -./deploy.sh --local-icrc1-image-tar ~/workspaces/ic/ic-master/bazel-bin/rs/rosetta-api/icrc1/icrc_rosetta_image.tar --icrc1-ledgers 'lkwrt-vyaaa-aaaaq-aadhq-cai,xsi2v-cyaaa-aaaaq-aabfq-cai' --no-icrc1-latest +./deploy.sh --local-icrc1-image-tar ~/workspaces/ic/ic-master/bazel-bin/rs/rosetta-api/icrc1/icrc_rosetta_image_tarball/tarball.tar --icrc1-ledgers 'lkwrt-vyaaa-aaaaq-aadhq-cai,xsi2v-cyaaa-aaaaq-aabfq-cai' --no-icrc1-latest ``` The services and pods deployed with those images will have a `-local` in their names. @@ -168,7 +168,7 @@ bazel build //rs/rosetta-api/icrc1:icrc_rosetta_image.tar # Redeploy only the ICRC local instance (other instances keep running) ./deploy.sh --use-persistent-volumes \ - --local-icrc1-image-tar bazel-bin/rs/rosetta-api/icrc1/icrc_rosetta_image.tar + --local-icrc1-image-tar bazel-bin/rs/rosetta-api/icrc1/icrc_rosetta_image_tarball/tarball.tar ``` The script will: diff --git a/rs/tests/system_tests.bzl b/rs/tests/system_tests.bzl index 45a9fd28b34a..e447163ada70 100644 --- a/rs/tests/system_tests.bzl +++ b/rs/tests/system_tests.bzl @@ -2,7 +2,6 @@ Rules for system-tests. """ -load("@bazel_skylib//rules:copy_file.bzl", "copy_file") load("@rules_oci//oci:defs.bzl", "oci_load") load("@rules_rust//rust:defs.bzl", "rust_binary") load("@rules_shell//shell:sh_test.bzl", "sh_test") @@ -405,11 +404,11 @@ def oci_tar(name, image, repo_tags = []): basename = name.removesuffix(".tar") - name_image = basename + "_image" + tarball = basename + "_tarball" # First load the image oci_load( - name = name_image, + name = tarball, image = image, repo_tags = repo_tags, target_compatible_with = [ @@ -418,24 +417,12 @@ def oci_tar(name, image, repo_tags = []): ) # create the tarball - name_tarballdir = basename + "_tarballdir" native.filegroup( - name = name_tarballdir, - srcs = [":" + name_image], + name = name, + srcs = [":" + tarball], output_group = "tarball", target_compatible_with = [ "@platforms//os:linux", ], tags = ["manual"], ) - - # Copy the tarball out so we can reference the file by 'name' - copy_file( - name = basename + "_tar", - src = ":" + name_tarballdir, - out = name, - target_compatible_with = [ - "@platforms//os:linux", - ], - tags = ["manual"], - )