Merge branch 'levsha/-IDX-2606-Build-a-separte-dev-guest-os-image-with-fixed-ic-version-' into 'master'

[IDX-2606] Build a separte dev guest-os image with fixed ic version.

As ic version will not change for this image it will be only rebuild
when the actual content changes. In other cases the cache will be used
for the image itself and all tests that require this image.

Do not upload this image to S3: tests that use it are expected to consume it either directly or from bazel cache. 

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

Author: levsha

ic-os/defs.bzl

@@ -399,58 +399,61 @@ def icos_build(name, upload_prefix, image_deps, mode = None, malicious = False,
     if malicious:
         upload_suffix += "-malicious"
 
-    upload_artifacts(
-        name = "upload_disk-img",
-        inputs = [
-            ":disk-img.tar.zst",
-            ":disk-img.tar.gz",
-        ],
-        remote_subdir = upload_prefix + "/disk-img" + upload_suffix,
-    )
-
-    output_files(
-        name = "disk-img-url",
-        target = ":upload_disk-img",
-        basenames = ["upload_disk-img_disk-img.tar.zst.url"],
-        visibility = ["//visibility:public"],
-        tags = ["manual"],
-    )
-
-    if upgrades:
+    if upload_prefix != None:
         upload_artifacts(
-            name = "upload_update-img",
+            name = "upload_disk-img",
             inputs = [
-                ":update-img.tar.zst",
-                ":update-img.tar.gz",
-                ":update-img-test.tar.zst",
-                ":update-img-test.tar.gz",
+                ":disk-img.tar.zst",
+                ":disk-img.tar.gz",
             ],
-            remote_subdir = upload_prefix + "/update-img" + upload_suffix,
+            remote_subdir = upload_prefix + "/disk-img" + upload_suffix,
+        )
+
+        output_files(
+            name = "disk-img-url",
+            target = ":upload_disk-img",
+            basenames = ["upload_disk-img_disk-img.tar.zst.url"],
+            visibility = ["//visibility:public"],
+            tags = ["manual"],
         )
 
-    # -------------------- Bazel ergonomics --------------------
+        if upgrades:
+            upload_artifacts(
+                name = "upload_update-img",
+                inputs = [
+                    ":update-img.tar.zst",
+                    ":update-img.tar.gz",
+                    ":update-img-test.tar.zst",
+                    ":update-img-test.tar.gz",
+                ],
+                remote_subdir = upload_prefix + "/update-img" + upload_suffix,
+            )
 
-    native.filegroup(
-        name = "hash_and_upload_disk-img",
-        srcs = [
-            ":upload_disk-img",
-            ":disk-img.tar.zst.sha256",
-        ],
-        visibility = ["//visibility:public"],
-        tags = ["manual"],
-    )
+        # -------------------- Bazel ergonomics --------------------
 
-    if upgrades:
         native.filegroup(
-            name = "hash_and_upload_update-img",
+            name = "hash_and_upload_disk-img",
             srcs = [
-                ":upload_update-img",
-                ":update-img.tar.zst.sha256",
+                ":upload_disk-img",
+                ":disk-img.tar.zst.sha256",
             ],
             visibility = ["//visibility:public"],
             tags = ["manual"],
         )
 
+        if upgrades:
+            native.filegroup(
+                name = "hash_and_upload_update-img",
+                srcs = [
+                    ":upload_update-img",
+                    ":update-img.tar.zst.sha256",
+                ],
+                visibility = ["//visibility:public"],
+                tags = ["manual"],
+            )
+
+    # end if upload_prefix != None
+
     if upgrades:
         upgrade_outputs = [
             ":update-img.tar.zst",

ic-os/guestos/envs/dev-fixed-version/BUILD.bazel

@@ -0,0 +1,14 @@
+load("//ic-os:defs.bzl", "icos_build")
+load("//ic-os/guestos:defs.bzl", "image_deps")
+
+# The macro contains several targets.
+# Check
+#       //ic-os/guestos/BUILD.bazel for examples
+#    or //ic-os/defs.bzl for the full list of targets.
+icos_build(
+    name = "dev",
+    ic_version = "//bazel:rc_only_version.txt",
+    image_deps = image_deps,
+    upload_prefix = None,
+    visibility = ["//visibility:public"],
+)

publish/binaries/BUILD.bazel

@@ -64,9 +64,7 @@ BINARIES = {
     name = name,
     binary = BINARIES[name],
     visibility = [
-        "//ic-os/guestos/envs/dev:__pkg__",
-        "//ic-os/guestos/envs/dev-malicious:__pkg__",
-        "//ic-os/guestos/envs/prod:__pkg__",
+        "//ic-os/guestos/envs:__subpackages__",
         "//ic-os/hostos/envs/dev:__pkg__",
         "//ic-os/hostos/envs/prod:__pkg__",
     ],
@@ -82,8 +80,7 @@ BINARIES = {
         "//ic-os/boundary-guestos/envs/dev-sev:__pkg__",
         "//ic-os/boundary-guestos/envs/prod:__pkg__",
         "//ic-os/boundary-guestos/envs/prod-sev:__pkg__",
-        "//ic-os/guestos/envs/dev:__pkg__",
-        "//ic-os/guestos/envs/dev-malicious:__pkg__",
+        "//ic-os/guestos/envs:__subpackages__",
         "//ic-os/guestos/envs/prod:__pkg__",
         "//ic-os/hostos/envs/dev:__pkg__",
         "//ic-os/hostos/envs/prod:__pkg__",