RPMbuild Support

.github/workflows/reusable-build.yaml

@@ -3,6 +3,7 @@ name: ReusableBuild
 on: [workflow_call]
 
 jobs:
+
   build-arm64-cuttlefish-deb-job:
     runs-on: ubuntu-latest
     steps:

.github/workflows/reusable-docker.yml

@@ -0,0 +1,138 @@
+name: Reusable Docker Container Run
+
+on:
+  workflow_call:
+    secrets:
+      token:
+        required: true
+    inputs:
+      registry:
+        default: 'ghcr.io'
+        required: false
+        type: string
+      username:
+        required: true
+        type: string
+      image:
+        required: true
+        type: string
+      tag:
+        default: latest
+        required: false
+        type: string
+      platform:
+        default: linux/amd64
+        required: false
+        type: string
+    outputs:
+      builder:
+        value: ${{ jobs.docker-run.outputs.builder }}
+        description: "Build output"
+      testing:
+        value: ${{ jobs.docker-run.outputs.testing }}
+        description: "Package test output"
+      integration:
+        value: ${{ jobs.docker-run.outputs.integration }}
+        description: "Integration output"
+      orchestration:
+        value: ${{ jobs.docker-run.outputs.orchestration }}
+        description: "Orchestration output"
+jobs:
+
+  docker-run:
+    runs-on: ubuntu-latest
+    outputs:
+      builder: ${{ steps.build-rpm-packages.outputs.result }}
+      testing: ${{ steps.test-rpm-packages.outputs.result }}
+      integration: ${{ steps.test-integration.outputs.result }}
+      orchestration: ${{ steps.test-orchestration.outputs.result }}
+    env:
+      DEFAULT_OPTIONS: '--attach STDOUT --attach STDERR --quiet'
+    steps:
+
+      # https://github.com/docker/login-action
+      - name: Log in to the Container registry
+        uses: 'docker/login-action@v3'
+        id: container-registry
+        with:
+          registry: ${{ INPUTS.REGISTRY }}
+          username: ${{ INPUTS.USERNAME }}
+          password: ${{ SECRETS.TOKEN }}
+
+      # https://docs.docker.com/reference/cli/docker/container/run/
+      # https://docs.docker.com/reference/cli/docker/container/cp/
+      # --entrypoint ${{ INPUTS.ENTRY-POINT }} cannot be changed with GitHub docker.
+      - name: Run docker and somehow extract the archive from the volume.
+        if: ${{ contains(INPUTS.IMAGE, 'builder') && !contains(INPUTS.PLATFORM, 'linux/arm64') }}
+        id: build-rpm-packages
+        shell: bash
+        env:
+          RPM_PLATFORM: ${{ INPUTS.PLATFORM }}
+          DOCKER_IMAGE: ${{ INPUTS.REGISTRY }}/${{ INPUTS.USERNAME }}/${{ INPUTS.IMAGE }}:${{ INPUTS.TAG }}
+          DOCKER_OPTIONS: '--name rpm-builder'
+        run: |
+          # docker run $DOCKER_OPTIONS $DEFAULT_OPTIONS --env platform="$RPM_PLATFORM" $$DOCKER_IMAGE
+          docker run $DOCKER_OPTIONS $DEFAULT_OPTIONS $DOCKER_IMAGE >> $GITHUB_STEP_SUMMARY
+          MOUNT_POINT=$(docker volume ls --filter driver="local" --format '{{.Mountpoint}}')
+          VOLUME_HASH=$(docker volume ls --filter driver="local" --format '{{.Name}}')          
+          DIRECTORY=/var/lib/docker/volumes/$VOLUME_HASH/_data
+          CID=`docker ps -aqf "name=^rpm-builder$"`
+
+          echo Listing container $CID with attached volume: $DIRECTORY
+          echo Mountpoint value: $MOUNT_POINT
+
+          # TODO: Finds nothing, because the entrypoint.sh does not seem to execute.
+          # docker cp $CID:/root/android-cuttlefish-rpm.tar.gz ${{ RUNNER.TEMP }}
+          # docker cp rpm-builder:/root/android-cuttlefish-rpm.tar.gz ${{ RUNNER.TEMP }}
+          sudo ls -la $DIRECTORY
+          cp $DIRECTORY/android-cuttlefish-rpm.tar.gz ${{ RUNNER.TEMP }}
+
+          docker rm rpm-builder
+          echo "result=ok" >> $GITHUB_OUTPUT
+
+      # https://github.com/actions/upload-artifact
+      - name: Retain Artifacts (*.rpm)
+        uses: 'actions/upload-artifact@v4'
+        id: retain-rpm-packages
+        if: ${{ contains(INPUTS.IMAGE, 'builder') && !contains(INPUTS.PLATFORM, 'linux/arm64') }}
+        with:
+          path: ${{ RUNNER.TEMP }}/*.tar.gz
+          name: android-cuttlefish-rhel-${{ INPUTS.PLATFORM }}
+          retention-days: 14
+
+      # https://docs.docker.com/reference/cli/docker/container/run/
+      - name: Run package tests
+        if: ${{ contains(INPUTS.IMAGE, 'testing') }}
+        id: test-rpm-packages
+        shell: bash
+        env:
+          DOCKER_IMAGE: ${{ INPUTS.REGISTRY }}/${{ INPUTS.USERNAME }}/${{ INPUTS.IMAGE }}:${{ INPUTS.TAG }}
+          DOCKER_OPTIONS: '--name rpm-testing'
+        run: |
+          docker run $DOCKER_OPTIONS $DEFAULT_OPTIONS $DOCKER_IMAGE >> $GITHUB_STEP_SUMMARY
+          docker rm rpm-testing
+          echo "result=ok" >> $GITHUB_OUTPUT
+
+      # https://docs.docker.com/reference/cli/docker/container/run/
+      - name: Run integration test
+        if: ${{ contains(INPUTS.IMAGE, 'integration') }}
+        id: test-integration
+        shell: bash
+        env:
+          DOCKER_IMAGE: ${{ INPUTS.REGISTRY }}/${{ INPUTS.USERNAME }}/${{ INPUTS.IMAGE }}:${{ INPUTS.TAG }}
+          DOCKER_OPTIONS: '--name rhel-integration'
+        run: |
+          docker run $DOCKER_OPTIONS $DEFAULT_OPTIONS $DOCKER_IMAGE >> $GITHUB_STEP_SUMMARY
+          echo "result=ok" >> $GITHUB_OUTPUT
+
+      # https://docs.docker.com/reference/cli/docker/container/run/
+      - name: Run orchestration test
+        if: ${{ contains(INPUTS.DOCKER-IMAGE, 'orchestration') }}
+        id: test-orchestration
+        shell: bash
+        env:
+          DOCKER_IMAGE: ${{ INPUTS.REGISTRY }}/${{ INPUTS.USERNAME }}/${{ INPUTS.IMAGE }}:${{ INPUTS.TAG }}
+          DOCKER_OPTIONS: '--name rhel-orchestration'
+        run: |
+          docker run $DOCKER_OPTIONS $DEFAULT_OPTIONS $DOCKER_IMAGE >> $GITHUB_STEP_SUMMARY
+          echo "result=ok" >> $GITHUB_OUTPUT

.github/workflows/rpm-builder.yml

@@ -0,0 +1,116 @@
+name: RPM Builder
+
+on: [ push ]
+
+jobs:
+
+  build-images:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    strategy:
+      max-parallel: 1
+      matrix:
+        platform: [ linux/amd64 ]
+        #  target: [ rpm-builder, rpm-testing, rhel-integration, rhel-orchestration ]
+        target: [ rpm-builder, rpm-testing ]
+        include:
+          - target: rpm-builder
+            stage: builder
+          - target: rpm-testing
+            stage: testing
+    #          - target: rhel-integration
+    #            stage: integration
+    #          - target: rhel-orchestration
+    #            stage: orchestration
+    #        exclude:
+    #          - platform: linux/arm64
+    #            target: rpm-testing
+    #          - platform: linux/arm64
+    #            target: rhel-integration
+    #          - platform: linux/arm64
+    #            target: rpm-testing
+
+    steps:
+      - uses: 'actions/checkout@v4'
+      - uses: 'docker/setup-qemu-action@v3'
+        with:
+          platforms: arm64
+
+      # https://github.com/docker/metadata-action
+      - name: Extract metadata (tags, labels)
+        uses: 'docker/metadata-action@v5'
+        id: metadata
+        with:
+          images: ghcr.io/${{ GITHUB.ACTOR }}/${{ MATRIX.TARGET }}
+          tags: ${{ GITHUB.ACTOR }}/${{ MATRIX.TARGET }}:latest
+
+      - uses: 'docker/login-action@v3'
+        id: container-registry
+        with:
+          registry: 'ghcr.io'
+          username: ${{ GITHUB.ACTOR }}
+          password: ${{ SECRETS.GITHUB_TOKEN }}
+
+      # https://github.com/marketplace/actions/build-and-push-docker-images
+      - uses: 'docker/setup-buildx-action@v3'
+      - name: Build and push Docker image
+        uses: 'docker/build-push-action@v6'
+        id: build
+        with:
+          context: .
+          file: docker/rpm-builder/Dockerfile
+          push: ${{ GITHUB.EVENT_NAME != 'pull_request' }}
+          platforms: ${{ MATRIX.PLATFORM }}
+          target: ${{ MATRIX.TARGET_STAGE }}
+          builder: ${{ steps.buildx.outputs.name }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          tags: ${{ steps.metadata.outputs.tags }}
+
+      # Note: The digest comes from `buildx`, not the metadata.
+      # https://github.com/actions/attest-build-provenance
+      - name: Generate artifact attestation
+        uses: 'actions/attest-build-provenance@v2'
+        with:
+          subject-name: ghcr.io/${{ GITHUB.ACTOR }}/${{ MATRIX.TARGET }}
+          subject-digest: ${{ steps.build.outputs.digest }}
+          push-to-registry: true
+
+  run-images:
+    uses: ./.github/workflows/reusable-docker.yml
+    needs: build-images
+    with:
+      registry: 'ghcr.io'
+      username: ${{ GITHUB.ACTOR }}
+      image: ${{ MATRIX.TARGET }}
+      platform: ${{ MATRIX.PLATFORM }}
+    secrets:
+      token: ${{ SECRETS.GITHUB_TOKEN }}
+    strategy:
+      max-parallel: 1
+      matrix:
+        # The `platform` is being passed into the shell as variable $RPM_PLATFORM.
+        # platform: [ linux/amd64, linux/arm64 ]
+        platform: [ linux/amd64 ]
+        #  target: [ rpm-builder, rpm-testing, rhel-integration, rhel-orchestration ]
+        target: [ rpm-builder, rpm-testing ]
+        include:
+          - target: rpm-builder
+            stage: builder
+          - target: rpm-testing
+            stage: testing
+#          - target: rhel-integration
+#            stage: integration
+#          - target: rhel-orchestration
+#            stage: orchestration
+#        exclude:
+#          - platform: linux/arm64
+#            target: rpm-testing
+#          - platform: linux/arm64
+#            target: rhel-integration
+#          - platform: linux/arm64
+#            target: rpm-testing

base/cvd/MODULE.bazel

@@ -59,6 +59,7 @@ git_override(
 )
 
 git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
 git_repository(
     name = "fruit",
     build_file = "@//:BUILD.fruit.bazel",
@@ -146,7 +147,6 @@ git_repository(
     build_file = "@//build_external/wayland:BUILD.wayland.bazel",
     commit = "b2649cb3ee6bd70828a17e50beb16591e6066288", # 1.22.0
     remote = "https://gitlab.freedesktop.org/wayland/wayland.git",
-    patch_strip = 1,
     patches = [
         "@//build_external/wayland:PATCH.wayland.wayland_config.patch",
     ],

base/debian/cuttlefish-base.cuttlefish-host-resources.init

@@ -28,6 +28,16 @@
 # Make sure calls to this script get redirected to systemctl when
 # using systemd
 
+### BEGIN INIT INFO
+# Provides:          cuttlefish-host-resources
+# Required-Start:    $syslog
+# Required-Stop:     $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start daemon at boot time
+# Description:       Enable service provided by daemon.
+### END INIT INFO
+
 # some system may not support bridge type by default
 modprobe bridge
 
@@ -359,7 +369,12 @@ case "$1" in
         # Nothing to do; we reread configuration on each invocation
         ;;
     status)
-        rh_status
+        # command `rh_status` may not be available.
+        if command -v rh_status > /dev/null ; then
+            rh_status
+        else
+            systemctl status cuttlefish.service
+        fi
         ;;
     shutdown)
         stop

base/rhel/cuttlefish.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Cuttlefish Host Resources
+After=syslog.target network.target
+Requires=libvirtd.service
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStart=/etc/rc.d/init.d/cuttlefish-host-resources start
+
+[Install]
+WantedBy=multi-user.target
+