Revert HostOS MR due to CI failures

.gitignore

@@ -67,14 +67,13 @@ dist-newstyle
 test_report.xml
 
 # IC-OS disk images
-*-os.iso
-*-img.tar.gz
+ic-os.img.tar
+ic-os.img
 
 # Various build artifacts
 /artifacts/
 **/build
 **/build-tmp
-**/build-out
 **/boot/version.txt
 **/bin/canister_sandbox
 **/bin/ic-btc-adapter
@@ -86,7 +85,7 @@ test_report.xml
 **/bin/replica
 **/bin/state-tool
 **/bin/vsock_agent
-**/bin/sandbox_launcher
+**/bin/canister_sandbox
 **/bin/boundary-node-prober
 
 # Boundary node control plane binary

Capsule.toml

@@ -63,7 +63,6 @@ input = [
         "artifacts/canisters/xnet-test-canister.wasm.gz",
         # IC-OS Build scripts
         "ic-os/guestos/scripts/*",
-        "ic-os/scripts/*",
         "gitlab-ci/src/job_scripts/*",
         "ic-os/guestos/bootloader/*",
         "ic-os/guestos/rootfs/**/*",

gitlab-ci/config/00--child-pipeline-root.yml

@@ -18,10 +18,6 @@ include:
 - local: /gitlab-ci/config/47--guest-os-test--guest-os-e2e-test.yml
 - local: /gitlab-ci/config/47--guest-os-test--e2e-scalability.yml
 - local: /gitlab-ci/config/48--determinism-test.yml
-- local: /gitlab-ci/config/52--host-os-build--build-host-img.yml
-- local: /gitlab-ci/config/52--host-os-build--build-update-img.yml
-- local: /gitlab-ci/config/53--host-os-build--build-iso-img.yml
-- local: /gitlab-ci/config/54--host-os-test--host-os-upgrade-test.yml
 
 .cargo-build-docker-protected:
   needs: []  # don't wait on other jobs by default

gitlab-ci/config/00--common.yml

@@ -12,8 +12,6 @@ stages:             # Files from the given stage should be prefixed with:
   - guest-os-test       # 47--
   - build-determinism-test  # 48--
   - e2e-tests           # 50--
-  - host-os-build       # 52--
-  - host-os-test        # 54--
   - prod-tests          # 60--
     # Shard prod tests into 5 groups, because there are 5 'cdnightly' testnet environments.
     # The stages are purely for visual convenience when rendering the pipeline in the GitLab UI.
@@ -223,7 +221,7 @@ after_script:
   # - Build results are stored in non-persisted /cargo_target
   # - The container is destroyed and all non-persisted data is dropped, including /cargo_target
   image:
-    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build-nix:2022-03-29-0bd5868e7-680ce9a5065742d97e268e3889118eaf21a26a4a"
+    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build-nix:2022-03-29-09b55cf44-d94121860c64b161888521097e591ee2e25c0637"
   tags:
     # Build on runners that have following tags
     - dfinity

gitlab-ci/config/30--cargo-build--child-pipeline.yml

@@ -45,7 +45,7 @@ cargo-build-release-linux-native:
     - .rules-parent-pipeline-autorun-on-trigger
   image:
     # Use the docker image without nix-shell
-    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:2022-03-29-0bd5868e7-29457eb1fba2642d9df5cdc0022655acfea974cc"
+    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:2022-03-29-09b55cf44-be6eecb8e51ffc7fc98bb891a45bc77bde931b58"
   variables:
     ARTIFACT_EXT: ""
   artifacts:
@@ -67,7 +67,7 @@ cargo-build-canisters:
     ARTIFACT_EXT: ""
   image:
     # Use the docker image without nix-shell
-    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:2022-03-29-0bd5868e7-29457eb1fba2642d9df5cdc0022655acfea974cc"
+    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:2022-03-29-09b55cf44-be6eecb8e51ffc7fc98bb891a45bc77bde931b58"
   artifacts:
     paths:
       - "artifacts/canisters${ARTIFACT_EXT}/*"
@@ -92,7 +92,7 @@ dfx-build-release-linux:
       - artifacts/sdk-release/*
   image:
     # Use the docker image without nix-shell
-    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:2022-03-29-0bd5868e7-29457eb1fba2642d9df5cdc0022655acfea974cc"
+    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:2022-03-29-09b55cf44-be6eecb8e51ffc7fc98bb891a45bc77bde931b58"
   variables:
     BUILD_COMMAND: ""
     CARGO_BUILD_TARGET: x86_64-unknown-linux-gnu

gitlab-ci/docker/Dockerfile

@@ -25,8 +25,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
         zip unzip rclone rsync bc csmith gcc lld lld-10 libc++-10-dev libcsmith-dev sqlite3 libsqlite3-dev libselinux-dev libunwind-dev \
         qemu-system-x86 ovmf iproute2 dosfstools mtools fakeroot faketime android-sdk-ext4-utils \
         policycoreutils python3 python3-requests python3-pip python3-gflags python3-cbor pipenv shellcheck bazel-5.0.0 \
-        sudo docker-ce-cli ripgrep patchelf asciidoctor plantuml graphviz cpio nodejs npm gosu pigz \
-        ca-certificates curl git isolinux p7zip-full syslinux xorriso && \
+        sudo docker-ce-cli ripgrep patchelf asciidoctor plantuml graphviz cpio nodejs npm gosu pigz && \
     gem install asciidoctor-diagram rouge && \
     ln -s $(which bazel-5.0.0) /usr/bin/bazel
 

gitlab-ci/docker/TAG

@@ -1 +1 @@
-2022-03-29-0bd5868e7
+2022-03-29-09b55cf44

gitlab-ci/tools/build-ic

@@ -154,8 +154,6 @@ if [ "$BUILD_IMAGES" == "true" ]; then
     fi
     echo -e "\n${HEADER_ICOS}\n"
     gitlab-ci/src/job_scripts/lib/guest-os-updateimg.sh "${DISK_DIR}"
-    # XXX FIXME: Avoid building host-os update image until artifact limit has been increased.
-    # gitlab-ci/src/job_scripts/lib/host-os-updateimg.sh "${DISK_DIR}"
 fi
 
 echo
@@ -178,8 +176,6 @@ if [ "$BUILD_IMAGES" == "true" ] && [ "$BUILD_BINARIES" == "true" ] && [ "$BUILD
     echo IC-OS Image
     cd "$DISK_DIR"
     ls -1 update-img.tar.gz | xargs -n1 sha256sum | tee /tmp/update-img.txt
-    # XXX FIXME: Avoid building host-os update image until artifact limit has been increased.
-    # ls -1 host-update-img.tar.gz | xargs -n1 sha256sum | tee /tmp/host-update-img.txt
     echo
 fi
 
@@ -193,7 +189,5 @@ if [ "$BUILD_CANISTERS" == "true" ]; then
 fi
 if [ "$BUILD_IMAGES" == "true" ] && [ "$BUILD_BINARIES" == "true" ] && [ "$BUILD_CANISTERS" == "true" ]; then
     sha256sum update-img.txt
-    # XXX FIXME: Avoid building host-os update image until artifact limit has been increased.
-    # sha256sum host-update-img.txt
 fi
 echo