1.55 updates

.github/actions/gigabyte-ampere-cuttlefish-installer-check-preseed-after-install-script/action.yaml

@@ -23,7 +23,6 @@ runs:
       apt-get install -y lsb-release
       apt-get install -y pciutils
       apt-get install -y apt-show-versions
-      apt-get install -y linux-image-arm64 linux-headers-arm64
   - name: Setup base and non-free repository
     shell: bash
     run: |

.github/actions/run-cw-sharded-e2e-test/action.yaml

@@ -16,6 +16,8 @@ runs:
       with:
         name: android-cuttlefish-e2etest-image-tar
         github-token: ${{ github.token }}
+    - name: Upgrade crun
+      uses: ./.github/actions/upgrade-crun
     - name: Run tests
       shell: bash
       env:

.github/actions/upgrade-crun/action.yaml

@@ -0,0 +1,29 @@
+name: 'Upgrade crun'
+description: 'Upgrade crun to latest version to avoid OCI compatibility issues'
+runs:
+  using: "composite"
+  steps:
+    - name: Upgrade crun
+      shell: bash
+      run: |
+        TARGET_VERSION="1.28"
+        EXPECTED_HASH="2aa6b7024a9c9f153895c0d11ae233d3758f54844011c3a039e3e89048d01d42"
+        CRUN_PATH=$(which crun || echo "/usr/bin/crun")
+        echo "Current crun path: $CRUN_PATH"
+        if [ -f "$CRUN_PATH" ]; then
+          echo "Current crun version:"
+          $CRUN_PATH --version
+        fi
+
+        TEMP_CRUN=$(mktemp)
+        echo "Downloading crun $TARGET_VERSION..."
+        curl -L -o "$TEMP_CRUN" https://github.com/containers/crun/releases/download/${TARGET_VERSION}/crun-${TARGET_VERSION}-linux-amd64
+
+        echo "Verifying hash..."
+        echo "$EXPECTED_HASH  $TEMP_CRUN" | sha256sum --check
+
+        echo "Installing crun..."
+        sudo mv "$TEMP_CRUN" "$CRUN_PATH"
+        sudo chmod +x "$CRUN_PATH"
+        echo "Upgraded crun version:"
+        $CRUN_PATH --version

.github/workflows/gigabyte-ampere-cuttlefish-installer.yaml

@@ -56,7 +56,7 @@ jobs:
         nvidia_gpu: ["true", "false"]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Check preseed after install script
       uses: ./.github/actions/gigabyte-ampere-cuttlefish-installer-check-preseed-after-install-script
       with:
@@ -72,11 +72,11 @@ jobs:
       image: debian@sha256:13f29b6806e531c3ff3b565bb6eed73f2132506c8c9d41bb996065ca20fb27f2 # debian:trixie-20260223 (amd64)
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Build iso installer
       uses: ./.github/actions/build-gigabyte-ampere-cuttlefish-installer
     - name: Upload artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
         path: gigabyte-ampere-cuttlefish-installer/preseed-mini.iso.xz
@@ -93,9 +93,9 @@ jobs:
       TEST_DISK_SIZE: "10G"
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -137,9 +137,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -185,9 +185,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -233,9 +233,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -281,9 +281,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -301,6 +301,9 @@ jobs:
       run: |
         screen -d -m -L -Logfile console_001.log ./installer-iso-run-qemu.sh
         while ! egrep "[^[:space:]]+[[:space:]]login:" console_001.log; do sleep 30; done
+        # The login prompt appears before the system is usable, so wait for the
+        # boot to complete. "degraded" means booted with some unit failed.
+        until sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -o "ConnectTimeout 60" -p 33322 vsoc-01@localhost 'systemctl is-system-running | grep -qE "running|degraded"'; do sleep 30; done
         cp -f console_001.log console_001_p1.log
         CONSOLELINES=$(cat console_001_p1.log | wc -l)
         cat console_001_p1.log
@@ -361,9 +364,9 @@ jobs:
         working-directory: ./gigabyte-ampere-cuttlefish-installer
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
     - name: Download artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
       with:
         name: gigabyte-ampere-cuttlefish-installer-artifacts
     - name: Prepare test environment
@@ -381,6 +384,9 @@ jobs:
       run: |
         screen -d -m -L -Logfile console_001.log ./installer-iso-run-qemu.sh
         while ! egrep "[^[:space:]]+[[:space:]]login:" console_001.log; do sleep 30; done
+        # The login prompt appears before the system is usable, so wait for the
+        # boot to complete. "degraded" means booted with some unit failed.
+        until sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -o "ConnectTimeout 60" -p 33322 vsoc-01@localhost 'systemctl is-system-running | grep -qE "running|degraded"'; do sleep 30; done
         cp -f console_001.log console_001_p1.log
         CONSOLELINES=$(cat console_001_p1.log | wc -l)
         cat console_001_p1.log

.github/workflows/presubmit.yaml

@@ -304,6 +304,8 @@ jobs:
       with:
         name: debs_amd64
         github-token: ${{ github.token }}
+    - name: Upgrade crun
+      uses: ./.github/actions/upgrade-crun
     - name: Build image
       run: |
         tar -xvf debs_amd64.tar
@@ -363,6 +365,8 @@ jobs:
       with:
         name: android-cuttlefish-e2etest-image-tar
         github-token: ${{ github.token }}
+    - name: Upgrade crun
+      uses: ./.github/actions/upgrade-crun
     - name: Run tests
       run: |
         sudo podman info
@@ -509,6 +513,8 @@ jobs:
       uses: actions/download-artifact@v7
       with:
         name: cuttlefish-orchestration-amd64
+    - name: Upgrade crun
+      uses: ./.github/actions/upgrade-crun
     - name: Load docker image as podman image
       run: |
         sudo sysctl -w kernel.unprivileged_userns_clone=1

base/cvd/cuttlefish/common/libs/utils/container.cpp

@@ -22,18 +22,21 @@
 #include "cuttlefish/common/libs/utils/files.h"
 
 namespace cuttlefish {
+namespace {
 
-static bool IsRunningInDocker() {
+bool IsRunningInDocker() {
   // if /.dockerenv exists, it's inside a docker container
-  static std::string docker_env_path("/.dockerenv");
-  static bool ret =
-      FileExists(docker_env_path) || DirectoryExists(docker_env_path);
-  return ret;
+  std::string docker_env_path("/.dockerenv");
+  return FileExists(docker_env_path) || DirectoryExists(docker_env_path);
 }
 
+bool IsRunningInPodman() { return FileExists("/run/.containerenv"); }
+
+}  // namespace
+
 bool IsRunningInContainer() {
   // TODO: add more if we support other containers than docker
-  return IsRunningInDocker();
+  return IsRunningInDocker() || IsRunningInPodman();
 }
 
 }  // namespace cuttlefish

base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel

@@ -458,6 +458,7 @@ cf_cc_library(
         "@abseil-cpp//absl/strings",
         "@fmt",
         "@protobuf",
+        "@protobuf//src/google/protobuf/io:tokenizer",
     ],
 )