Put all runners on ubuntu 22.04 for consistency and update debian container images

Databean · Databean · commit 88190ff9749a · 2025-04-08T19:49:38.000Z
TODO: use variables to deduplicate these strings https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/accessing-contextual-information-about-workflow-runs#example-contents-of-the-env-context Bug: b/407791243
diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
@@ -12,7 +12,7 @@ jobs:
   export-debs:
     runs-on: ubuntu-22.04
     container:
-      image: debian@sha256:4cb3f4198e4af2d03dffe6bfa4f3686773596494ef298f3882553d52e885634b # debian:bullseye-20240110
+      image: debian@sha256:823849b88ae7e9b6ceb605fbdf51566499c234a9cfca8da1e4f22234fd65a09c # debian:bullseye-20250317 (amd64)
     steps:
     - name: apt update
       run: apt update -y && apt upgrade -y
@@ -32,10 +32,10 @@ jobs:
         name: debs
         path: debs.tar
   export-gce-image:
-    needs: export-debs 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-4core
+    needs: export-debs
     steps:
-    - name: Free space 
+    - name: Free space
       run: rm -rf /opt/hostedtoolcache
     - name: Checkout repository
       uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
@@ -89,4 +89,4 @@ jobs:
       uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # aka v4.0.0
       with:
         name: docker-image-arm64
-        path: ${{ env.arm64_image_path }}
+        path: ${{ env.arm64_image_path }}
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -16,9 +16,9 @@ concurrency:
 
 jobs:
   document-cvd:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
-      image: debian@sha256:3b6053ca925336c804e2d3f080af177efcdc9f51198a627569bfc7c7e730ef7e
+      image: debian@sha256:823849b88ae7e9b6ceb605fbdf51566499c234a9cfca8da1e4f22234fd65a09c # debian:bullseye-20250317 (amd64)
     steps:
     - name: Checkout repository
       uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
@@ -42,12 +42,12 @@ jobs:
         path: ./docs/
 
   deploy:
+    runs-on: ubuntu-22.04
+    container:
+      image: debian@sha256:823849b88ae7e9b6ceb605fbdf51566499c234a9cfca8da1e4f22234fd65a09c # debian:bullseye-20250317 (amd64)
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    container:
-      image: debian@sha256:3b6053ca925336c804e2d3f080af177efcdc9f51198a627569bfc7c7e730ef7e
     needs: document-cvd
     steps:
       - name: Deploy to GitHub Pages
diff --git a/.github/workflows/host-image-ci.yml b/.github/workflows/host-image-ci.yml
@@ -22,17 +22,17 @@ on: [push]
 
 jobs:
   build-installer-iso-job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
-      image: debian@sha256:c2cedd7f80a4dd0f9f80d3699bd433ccf3de33ab63bfa2d4c4ba870c998222d6 # debian:bookworm-20240311
+      image: debian@sha256:d12a7c2a24a396fc669fc4a571e482b75346dfc5af4a5c1140c8250eacdf3b3f # debian:bookworm-20250317 (amd64)
     env:
       DEBIAN_ISO_URL: https://deb.debian.org/debian/dists/bookworm/main/installer-arm64/current/images/netboot/mini.iso
     steps:
     - name: checkout repository
       uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
     - name: Prepare building environment
       run: apt-get update && apt-get upgrade -y && apt-get install -y sudo wget libarchive-tools xorriso cpio xz-utils fdisk
-    - name: Inject name and ID into preseed 
+    - name: Inject name and ID into preseed
       run: echo "CI_PROJECT_NAME=${{ github.event.repository.name }}" >> tools/cuttlefish-host-image-installer/preseed/after_install_1.sh && echo "CI_PIPELINE_ID=${{ github.repository}}/${{ github.workflow }}" >> tools/cuttlefish-host-image-installer/preseed//after_install_1.sh
     - name: Download Debian installer
       run: cd tools/cuttlefish-host-image-installer && wget -nv -c ${DEBIAN_ISO_URL} && ./addpreseed.sh && xz -9e preseed-mini.iso
@@ -46,12 +46,12 @@ jobs:
     uses: ./.github/workflows/reusable-build.yaml
 
   build-metapackage-deb-job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: checkout repository
       uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
     - name: Prepare pbuilder environment
-      run: sudo apt update && sudo apt-get install -y ubuntu-dev-tools qemu-user-static binfmt-support fakeroot equivs      
+      run: sudo apt update && sudo apt-get install -y ubuntu-dev-tools qemu-user-static binfmt-support fakeroot equivs
     - name: Prepare building environment
       run: sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y debconf-utils
     - name: Prepare tzdata
@@ -75,11 +75,11 @@ jobs:
       with:
         name: meta_gigamp_packages
         path: tools/cuttlefish-host-image-installer/meta_gigamp_packages.7z
-      
+
   build-uboot-qemu-job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
-      image: debian@sha256:c2cedd7f80a4dd0f9f80d3699bd433ccf3de33ab63bfa2d4c4ba870c998222d6 # debian:bookworm-20240311
+      image: debian@sha256:d12a7c2a24a396fc669fc4a571e482b75346dfc5af4a5c1140c8250eacdf3b3f # debian:bookworm-20250317 (amd64)
     env:
       UBOOT_GIT_URL: https://source.denx.de/u-boot/u-boot.git
       UBOOT_GIT_BRANCH: v2023.10
@@ -103,7 +103,7 @@ jobs:
         path: tools/cuttlefish-host-image-installer/u-boot.bin
 
   test-install-cuttlefish-deb-job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build-cuttlefish-deb-job
     steps:
     - name: checkout repository
@@ -114,7 +114,7 @@ jobs:
         name: cuttlefish_packages_arm64
         path: "tools/cuttlefish-host-image-installer"
     - name: Prepare pbuilder environment
-      run: sudo apt update && sudo apt-get install -y ubuntu-dev-tools qemu-user-static binfmt-support fakeroot equivs      
+      run: sudo apt update && sudo apt-get install -y ubuntu-dev-tools qemu-user-static binfmt-support fakeroot equivs
     - name: Prepare building environment
       run: sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y debconf-utils
     - name: Prepare tzdata
@@ -131,7 +131,7 @@ jobs:
       run: cd tools/cuttlefish-host-image-installer && ./tests/test-inside-pbuilder.sh stable arm64 ./tests/test-install-cuttlefish-deb.sh ./cuttlefish_packages.7z
 
   test-install-metapackage-deb-job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build-metapackage-deb-job
     steps:
     - name: checkout repository
@@ -142,7 +142,7 @@ jobs:
         name: meta_gigamp_packages
         path: "tools/cuttlefish-host-image-installer"
     - name: Prepare pbuilder environment
-      run: sudo apt update && sudo apt-get install -y ubuntu-dev-tools qemu-user-static binfmt-support fakeroot equivs      
+      run: sudo apt update && sudo apt-get install -y ubuntu-dev-tools qemu-user-static binfmt-support fakeroot equivs
     - name: Prepare building environment
       run: sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y debconf-utils
     - name: Prepare tzdata
diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   staticcheck:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         dir: ["e2etests", "frontend/src/host_orchestrator", "frontend/src/libhoclient", "frontend/src/liboperator", "frontend/src/operator"]
@@ -27,7 +27,7 @@ jobs:
         install-go: false
         working-directory: ${{ matrix.dir }}
   build-orchestrator:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout repository
       uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
@@ -39,12 +39,11 @@ jobs:
     - name: Vet Test Build
       run: cd frontend/src/host_orchestrator && go vet ./... && go test ./... && go build ./...
   build-debian-package:
-    runs-on: ubuntu-20.04-4core
+    runs-on: ubuntu-22.04-4core
+    container:
+      image: debian@sha256:823849b88ae7e9b6ceb605fbdf51566499c234a9cfca8da1e4f22234fd65a09c # debian:bullseye-20250317 (amd64)
     if: ${{ always() && needs.build-orchestrator.result == 'success' }}
     needs: [build-orchestrator]
-    container:
-      # debian:bullseye
-      image: debian@sha256:3b6053ca925336c804e2d3f080af177efcdc9f51198a627569bfc7c7e730ef7e
     steps:
     - name: Common bazel setup
       uses: bazel-contrib/setup-bazel@f3f50ea6791b9b0f4c4eeabba4507422426462f5 #aka 0.9.1
@@ -58,7 +57,7 @@ jobs:
       run: apt update -y && apt upgrade -y
     - name: install debuild dependencies
       run: apt install -y git devscripts config-package-dev debhelper-compat golang protobuf-compiler
-    - name: go version 
+    - name: go version
       run: go version
     - name: checkout repository
       uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
@@ -77,9 +76,9 @@ jobs:
     - name: install user debian package
       run: dpkg -i android-cuttlefish/cuttlefish-user_*_*64.deb || apt-get install -f -y
   build-cvd:
-    runs-on: ubuntu-latest
-    container: 
-      image: debian@sha256:3b6053ca925336c804e2d3f080af177efcdc9f51198a627569bfc7c7e730ef7e
+    runs-on: ubuntu-22.04-4core
+    container:
+      image: debian@sha256:823849b88ae7e9b6ceb605fbdf51566499c234a9cfca8da1e4f22234fd65a09c # debian:bullseye-20250317 (amd64)
     steps:
     - name: Common bazel setup
       uses: bazel-contrib/setup-bazel@f3f50ea6791b9b0f4c4eeabba4507422426462f5 #aka 0.9.1
@@ -105,7 +104,7 @@ jobs:
         name: testlogs
         path: bazel-testlogs
   e2e-tests-orchestration:
-    runs-on: ubuntu-22.04 
+    runs-on: ubuntu-22.04
     steps:
       # Do not reuse bazel cache among `e2e-tests-orchestration` runs.
       #
@@ -145,7 +144,7 @@ jobs:
         # [615 / 616] Executing genrule @@images//docker:orchestration_image_dev_tar; 11s linux-sandbox
         # //orchestration:create_fixed_build_id_and_target                         PASSED in 99.9s
         # //orchestration:create_local_image                                       PASSED in 92.4s
-        # 
+        #
         # The tests are running under 2 min, it's ok for now to execute them serially. The action's
         # bottleneck is building the debian packages: `@@images//docker/debs-builder-docker:debs_tar`.
         bazel test --sandbox_writable_path=$HOME --test_output=errors --local_test_jobs=1 --test_timeout=480 orchestration/...
diff --git a/.github/workflows/reusable-build.yaml b/.github/workflows/reusable-build.yaml
@@ -4,7 +4,7 @@ on: [workflow_call]
 
 jobs:
   build-arm64-cuttlefish-deb-job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: checkout repository
       uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 # aka v2
diff --git a/tools/buildimage/main.sh b/tools/buildimage/main.sh
@@ -25,10 +25,10 @@ wget https://cloud.debian.org/images/cloud/bullseye/20240104-1616/debian-11-gene
 popd
 
 out_dir=$(pwd)
-cp /tmp/debian-11-genericcloud-amd64-20240104-1616.raw ${out_dir}/disk.raw
+mv /tmp/debian-11-genericcloud-amd64-20240104-1616.raw ${out_dir}/disk.raw
 
+bash ${script_dir}/increase_disk_size.sh -r ${out_dir}/disk.raw
 bash ${script_dir}/install_gce_guest_environment.sh -r ${out_dir}/disk.raw
 bash ${script_dir}/install_cf_packages.sh -r ${out_dir}/disk.raw -p $(pwd)
-bash ${script_dir}/increase_disk_size.sh -r ${out_dir}/disk.raw
 
 tar -czvf image.tar.gz -C ${out_dir} disk.raw
