Merge branch 'main' into android11_gsi_test

Author: rmuthiah

.clang-format

@@ -19,4 +19,22 @@
 # of the below options.
 
 BasedOnStyle: Google
-IncludeBlocks: Preserve
+# Enforce grouping and sorting of #include directives into distinct blocks
+# separated by a blank line, evaluated in the order listed below:
+IncludeBlocks: Regroup
+IncludeCategories:
+  # 1. Project headers (cuttlefish/, allocd/, and external_proto/)
+  - Regex:           '^[<"](cuttlefish|allocd|external_proto)/'
+    Priority:        4
+  # 2. Plain C external third-party library headers inside angle brackets
+  - Regex:           '^<(zip|zlib|png|lz4|archive|tinyxml2|pcre2)\.h>'
+    Priority:        3
+  # 3. C/POSIX system headers (any other angle-bracket header ending in .h)
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  # 4. C++ standard library headers (extensionless angle-bracket headers)
+  - Regex:           '^<[a-z_]*>'
+    Priority:        2
+  # 5. External third-party library headers inside double quotes
+  - Regex:           '.*'
+    Priority:        3

.github/actions/bazel-9-readiness/action.yaml

@@ -3,7 +3,9 @@ runs:
   using: "composite"
   steps:
   - name: Setup apt
-    run: sudo apt-get update -y && sudo apt-get upgrade -y
+    run: |
+      sudo apt-get purge firefox
+      sudo apt-get update -y && sudo apt-get upgrade -y
     shell: bash
   - name: Install dependencies
     run: |

.github/actions/build-debian-packages/action.yaml

@@ -1,54 +1,40 @@
 name: 'Build debian packages for Cuttlefish host'
 inputs:
-  deploy-channel:
+  debian-version:
     required: false
-  yyyymmddhhmm:
+  image-version:
     required: false
 runs:
   using: "composite"
   steps:
   - name: Modify version format
-    if: inputs.deploy-channel != ''
+    if: inputs.debian-version != ''
     run: |
-      case "${INPUTS_DEPLOY_CHANNEL}" in
-        stable)
-          # Stable version format : X.Y.Z
-          SEMVER=$(echo ${GITHUB_REF_NAME} | grep -oE '[0-9]+.[0-9]+.[0-9]+')
-          sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(${SEMVER})/g" \
-            base/debian/changelog
-          sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(${SEMVER})/g" \
-            container/debian/changelog
-          sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(${SEMVER})/g" \
-            frontend/debian/changelog
-          sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(${SEMVER})/g" \
-            cuttlefish-integration-gigabyte-arm64/debian/changelog
-          ;;
-        unstable|nightly)
-          # Unstable/nightly version format : X.Y.Z~gitYYYYMMDDHHMM.<Github SHA 8 digit>
-          SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-8)
-          SUFFIX="~git${INPUTS_YYYYMMDDHHMM}.${SHORT_SHA}"
-          sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(\1${SUFFIX})/g" \
-            base/debian/changelog
-          sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(\1${SUFFIX})/g" \
-            container/debian/changelog
-          sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(\1${SUFFIX})/g" \
-            frontend/debian/changelog
-          sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(\1${SUFFIX})/g" \
-            cuttlefish-integration-gigabyte-arm64/debian/changelog
-          ;;
-        *)
-          exit 1
-          ;;
-      esac
+      FILES=(
+        "base/debian/changelog"
+        "container/debian/changelog"
+        "frontend/debian/changelog"
+        "cuttlefish-integration-gigabyte-arm64/debian/changelog"
+      )
+
+      for FILE in "${FILES[@]}"; do
+        sed -i "1s/(\([0-9]\+.[0-9]\+.[0-9]\+\))/(${INPUTS_DEBIAN_VERSION})/g" "$FILE"
+      done
     shell: bash
     env:
-      INPUTS_DEPLOY_CHANNEL: ${{ inputs.deploy-channel }}
-      INPUTS_YYYYMMDDHHMM: ${{ inputs.yyyymmddhhmm }}
+      INPUTS_DEBIAN_VERSION: ${{ inputs.debian-version }}
   - name: Build CF debian packages
     run: |
+      IMAGE_OPT=""
+      if [ -n "${INPUTS_IMAGE_VERSION}" ]; then
+        IMAGE_OPT="-e container_image_name=us-docker.pkg.dev/android-cuttlefish-artifacts/cuttlefish-orchestration/cuttlefish-orchestration:${INPUTS_IMAGE_VERSION}"
+      fi
+
       sudo docker build --file "tools/buildutils/cw/Containerfile" --tag "android-cuttlefish-build" .
       sudo docker run -v=$PWD:/mnt/build -w /mnt/build -v=$HOME/bazel-disk-cache:/root/bazel-disk-cache android-cuttlefish-build base -d /root/bazel-disk-cache
-      sudo docker run -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build container
+      sudo docker run ${IMAGE_OPT} -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build container
       sudo docker run -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build frontend
       sudo docker run -v=$PWD:/mnt/build -w /mnt/build android-cuttlefish-build cuttlefish-integration-gigabyte-arm64
     shell: bash
+    env:
+      INPUTS_IMAGE_VERSION: ${{ inputs.image-version }}

.github/actions/build-gigabyte-ampere-cuttlefish-installer/action.yaml

@@ -1,4 +1,9 @@
 name: 'Build iso installer for Gigabyte Ampere server'
+inputs:
+  deploy-channel:
+    required: false
+  debian-version:
+    required: false
 runs:
   using: "composite"
   steps:
@@ -17,11 +22,17 @@ runs:
       DEBIAN_ISO_URL: "https://deb.debian.org/debian/dists/trixie/main/installer-arm64/current/images/netboot/mini.iso"
       CI_PROJECT_NAME: ${{ github.event.repository.name }}
       CI_PIPELINE_ID: ${{ github.run_id }}
+      INPUTS_DEPLOY_CHANNEL: ${{ inputs.deploy-channel }}
+      INPUTS_DEBIAN_VERSION: ${{ inputs.debian-version }}
     shell: bash
     working-directory: ./gigabyte-ampere-cuttlefish-installer
     run: |
       sed -i "2i CI_PROJECT_NAME=${CI_PROJECT_NAME}" preseed/after_install_1.sh
       sed -i "3i CI_PIPELINE_ID=${CI_PIPELINE_ID}" preseed/after_install_1.sh
+      if [ x"${INPUTS_DEPLOY_CHANNEL}" != x"" ]; then
+        sed -i "s/^#DEPLOY_CHANNEL=/DEPLOY_CHANNEL=${INPUTS_DEPLOY_CHANNEL}/" preseed/after_install_1.sh
+        sed -i "s/^#DEPLOY_VERSION=/DEPLOY_VERSION=${INPUTS_DEBIAN_VERSION}/" preseed/after_install_1.sh
+      fi
       wget -nv -c ${DEBIAN_ISO_URL}
       ./addpreseed.sh
       xz -9e preseed-mini.iso

.github/actions/deploy-debian-packages/action.yaml

@@ -19,14 +19,13 @@ runs:
         "cuttlefish-metrics"
         "cuttlefish-orchestration"
         "cuttlefish-user"
+        "cuttlefish-podcvd"
       )
 
       if [[ ${INPUTS_DEPLOY_CHANNEL} == "stable" ]]; then
         REPO=android-cuttlefish
       else
         REPO=android-cuttlefish-${INPUTS_DEPLOY_CHANNEL}
-        # TODO: include cuttlefish-podcvd on stable afterwards
-        PACKAGES+=("cuttlefish-podcvd")
       fi
 
       pushd ${INPUTS_PATH}

.github/actions/deploy-docker-image/action.yaml

@@ -2,42 +2,19 @@ name: 'Deploy docker image cuttlefish-orchestration'
 inputs:
   arch:
     required: true
-  deploy-channel:
+  image-version:
     required: true
-  yyyymmddhhmm:
-    required: false
 runs:
   using: "composite"
   steps:
   - name: Deploy docker image into Artifact Registry
     run: |
-      case "${INPUTS_DEPLOY_CHANNEL}" in
-        stable)
-          # Stable version tag : X.Y.Z-<amd64|arm64>
-          SEMVER=$(echo ${GITHUB_REF_NAME} | grep -oE '[0-9]+.[0-9]+.[0-9]+')
-          TAG="${SEMVER}-${INPUTS_ARCH}"
-          ;;
-        unstable)
-          # Unstable version tag : X.Y-<Github SHA 8 digit>-<amd64|arm64>
-          SEMVER=$(echo ${GITHUB_REF_NAME} | grep -oE '[0-9]+.[0-9]+')
-          SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-8)
-          TAG="${SEMVER}-${SHORT_SHA}-${INPUTS_ARCH}"
-          ;;
-        nightly)
-          # Nightly version tag : gitYYYYMMDDHHMM-<Github SHA 8 digit>-<amd64|arm64>
-          SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-8)
-          TAG="git${INPUTS_YYYYMMDDHHMM}-${SHORT_SHA}-${INPUTS_ARCH}"
-          ;;
-        *)
-          exit 1
-          ;;
-      esac
+      TAG=${INPUTS_IMAGE_VERSION}-${INPUTS_ARCH}
       REMOTE_IMAGE_TAG=us-docker.pkg.dev/android-cuttlefish-artifacts/cuttlefish-orchestration/cuttlefish-orchestration:${TAG}
 
       docker tag cuttlefish-orchestration ${REMOTE_IMAGE_TAG}
       docker push ${REMOTE_IMAGE_TAG}
     shell: bash
     env:
-      INPUTS_DEPLOY_CHANNEL: ${{ inputs.deploy-channel }}
       INPUTS_ARCH: ${{ inputs.arch }}
-      INPUTS_YYYYMMDDHHMM: ${{ inputs.yyyymmddhhmm }}
+      INPUTS_IMAGE_VERSION: ${{ inputs.image-version }}

.github/actions/deploy-gigabyte-ampere-cuttlefish-installer/action.yaml

@@ -2,8 +2,8 @@ name: 'Deploy installer for Gigabyte Ampere server'
 inputs:
   deploy-channel:
     required: true
-  yyyymmddhhmm:
-    required: false
+  image-version:
+    required: true
   path:
     required: true
 runs:
@@ -16,35 +16,14 @@ runs:
   - name: Deploy installer image into Artifact Registry
     run: |
       REPO=gigabyte-ampere-server-installer
-      case "${INPUTS_DEPLOY_CHANNEL}" in
-        stable)
-          # Stable version tag : X.Y.Z
-          SEMVER=$(echo ${GITHUB_REF_NAME} | grep -oE '[0-9]+.[0-9]+.[0-9]+')
-          TAG="${SEMVER}"
-          ;;
-        unstable)
-          # Unstable version tag : X.Y-<Github SHA 8 digit>
-          SEMVER=$(echo ${GITHUB_REF_NAME} | grep -oE '[0-9]+.[0-9]+')
-          SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-8)
-          TAG="${SEMVER}-${SHORT_SHA}"
-          ;;
-        nightly)
-          # Nightly version tag : gitYYYYMMDDHHMM-<Github SHA 8 digit>
-          SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-8)
-          TAG="git${INPUTS_YYYYMMDDHHMM}-${SHORT_SHA}"
-          ;;
-        *)
-          exit 1
-          ;;
-      esac
       pushd ${INPUTS_PATH}
       gcloud artifacts versions delete ${INPUTS_DEPLOY_CHANNEL} \
         --location=us \
         --package="debian-installer" \
         --project="android-cuttlefish-artifacts" \
         --quiet \
         --repository="${REPO}" || true
-      for VERSION in ${TAG} ${INPUTS_DEPLOY_CHANNEL}; do
+      for VERSION in ${INPUTS_IMAGE_VERSION} ${INPUTS_DEPLOY_CHANNEL}; do
         gcloud artifacts generic upload \
           --location=us \
           --package="debian-installer" \
@@ -57,5 +36,5 @@ runs:
     shell: bash
     env:
       INPUTS_DEPLOY_CHANNEL: ${{ inputs.deploy-channel }}
-      INPUTS_YYYYMMDDHHMM: ${{ inputs.yyyymmddhhmm }}
+      INPUTS_IMAGE_VERSION: ${{ inputs.image-version }}
       INPUTS_PATH: ${{ inputs.path }}

.github/actions/gigabyte-ampere-cloud-installer-prepare-testbed/action.yaml

@@ -0,0 +1,35 @@
+name: 'Prepare testbed for Gigabyte Ampere Cloud installer'
+
+runs:
+  using: "composite"
+  steps:
+  - name: Install required packages
+    shell: bash
+    run: |
+      apt-get update
+      apt-get upgrade -y
+      apt-get install -y sudo
+      apt-get install -y debconf-utils
+      echo "tzdata tzdata/Areas select Etc" | debconf-set-selections -v
+      echo "tzdata tzdata/Zones/Etc select UTC" | debconf-set-selections -v
+      DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
+      dpkg-reconfigure --frontend noninteractive tzdata
+      echo "pbuilder pbuilder/mirrorsite string http://deb.debian.org/debian/" | debconf-set-selections -v
+      DEBIAN_FRONTEND=noninteractive apt-get install -y pbuilder
+      dpkg-reconfigure --frontend noninteractive pbuilder
+      apt-get install -y util-linux util-linux-extra
+      apt-get install -y xz-utils
+      apt-get install -y qemu-system-arm
+      apt-get install -y expect
+      apt-get install -y gdisk
+      apt-get install -y e2tools e2fsprogs
+      apt-get install -y fatcat mtools dosfstools
+      apt-get install -y guestfish
+      apt-get install -y lvm2
+      apt-get install -y ubuntu-dev-tools
+      apt-get install -y sshpass
+      apt-get install -y openssh-client
+      apt-get install -y u-boot-qemu
+      apt-get install -y udev libgudev-1.0-dev
+      apt-get install -y wget curl
+      apt-get install -y screen

.github/actions/gigabyte-ampere-cloud-installer-test-first-boot/action.yaml

@@ -0,0 +1,25 @@
+name: 'Gigabyte Cloud installer first-boot with qemu'
+
+runs:
+  using: "composite"
+  steps:
+  - name: Cloud image first boot with qemu
+    working-directory: ./gigabyte-ampere-cloud-installer
+    shell: bash
+    run: |
+      screen -d -m -L -Logfile console_001.log ./tests/run-qemu.sh gigabyte-cidata.iso "-nographic"
+      while ! egrep "[^[:space:]]+[[:space:]]login:" console_001.log; 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
+      grep "login:" console_001_p1.log > /dev/null
+      echo "CONSOLELINES=${CONSOLELINES}" >> $GITHUB_ENV
+  - name: Wait for post install script finish
+    working-directory: ./gigabyte-ampere-cloud-installer
+    shell: bash
+    run: |
+      sshpass -p cuttlefish ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -p 33322 vsoc-01@localhost 'while [ ! -e /var/log/custom-startup.log ]; do sleep 30; echo "Check custom-startup.log"; done'
+      sshpass -p cuttlefish scp -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -P 33322 vsoc-01@localhost:/var/log/custom-startup.log ./custom-startup.log
+      CUSTOM_LOG_LINES=$(wc -l < ./custom-startup.log)
+      cat ./custom-startup.log
+      while ! grep "VM successful" ./custom-startup.log; do sleep 30; sshpass -p cuttlefish scp -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" -P 33322 vsoc-01@localhost:/var/log/custom-startup.log ./custom-startup.log; tail -n +${CUSTOM_LOG_LINES} ./custom-startup.log; CUSTOM_LOG_LINES=$(wc -l < ./custom-startup.log); done

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

@@ -0,0 +1,56 @@
+name: 'Gigabyte Cuttlefish installer check preseed after install script'
+
+inputs:
+  emulate-nvidia:
+    required: false
+    default: "false"
+  emulate-amd:
+    required: false
+    default: "false"
+
+runs:
+  using: "composite"
+  steps:
+  - name: Prepare test environment
+    shell: bash
+    run: |
+      apt-get update
+      apt-get upgrade -y
+      apt-get install -y sudo
+      apt-get install -y initramfs-tools
+      apt-get install -y grub-efi-arm64
+      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 non-free repository
+    shell: bash
+    run: |
+      echo "deb http://deb.debian.org/debian $(lsb_release -c -s) contrib non-free non-free-firmware" | tee /etc/apt/sources.list.d/debian-nonfree-1.list
+      apt -o Apt::Get::Assume-Yes=true -o APT::Color=0 -o DPkgPM::Progress-Fancy=0 update
+  - name: Setup backports repository
+    shell: bash
+    run: |
+      if grep "apt-setup/services-select" preseed/preseed.cfg  | grep backports  | egrep '^[^#]'; then
+        echo "deb http://deb.debian.org/debian $(lsb_release -c -s)-backports main contrib non-free non-free-firmware" | tee /etc/apt/sources.list.d/debian-backports-1.list
+        apt -o Apt::Get::Assume-Yes=true -o APT::Color=0 -o DPkgPM::Progress-Fancy=0 update
+      fi
+  - name: Check nVidia GPU emulation
+    shell: bash
+    run: echo "EMULATE_NVIDIA_GPU=${{ inputs.emulate-nvidia }}" >> $GITHUB_ENV
+  - name: Check AMD GPU emulation
+    shell: bash
+    run: echo "EMULATE_AMD_GPU=${{ inputs.emulate-amd }}" >> $GITHUB_ENV
+  - name: Running tests
+    working-directory: ./gigabyte-ampere-cuttlefish-installer
+    shell: bash
+    run: |
+      ./tests/test-after-install-script-kernel.sh
+      sh after_install_1_kernel.sh
+      apt-show-versions linux-image-arm64
+      apt-show-versions linux-headers-arm64
+      apt-show-versions firmware-amd-graphics
+      apt-show-versions nvidia-open-kernel-dkms
+      apt-show-versions nvidia-kernel-dkms
+      apt-show-versions nvidia-driver
+      apt-show-versions firmware-misc-nonfree