COPR

.github/actions/build/action.yaml

@@ -43,6 +43,11 @@ inputs:
     - all
     - rpms
     - bootc-image
+  rpm-builder:
+    type: string
+    description: RPM builder image to use
+    required: false
+    default: rpm-local-builder
 
 runs:
   using: "composite"
@@ -56,9 +61,12 @@ runs:
       uses: ./.github/actions/debug-info
 
     - name: Prepare the build and run environment
+      # Skip if the rpm-builder is overridden - release.yaml builds RPMs using COPR.
+      if: inputs.rpm-builder == 'rpm-local-builder'
       uses: ./.github/actions/prebuild
 
     - name: Build MicroShift RPMs
+      if: inputs.rpm-builder == 'rpm-local-builder'
       shell: bash
       run: |
         # See https://github.com/microshift-io/microshift/blob/main/docs/build.md
@@ -89,6 +97,7 @@ runs:
         make image \
           BOOTC_IMAGE_URL=${{ inputs.bootc-image-url }} \
           BOOTC_IMAGE_TAG=${{ inputs.bootc-image-tag }} \
+          BUILDER_IMAGE=${{ inputs.rpm-builder }} \
           ${make_opts[@]}
 
     - name: Run a test to verify that MicroShift is functioning properly
@@ -143,17 +152,21 @@ runs:
         set -euo pipefail
         set -x
 
-        # Check if the MicroShift container is running
-        if ! sudo podman ps --format "{{.Names}}" | grep -q '^microshift-okd$' ; then
-          echo "WARNING: MicroShift container is not running - cannot collect sos report"
-          exit 0
-        fi
+        sudo podman ps --all
 
-        # Collect sos report from the MicroShift container
-        sudo podman exec -i microshift-okd microshift-sos-report
-        for f in $(sudo podman exec -i microshift-okd bash -c 'ls -1 /tmp/sosreport-*'); do
-          sudo podman cp microshift-okd:${f} /mnt/tmp/
-          sudo chmod 644 "/mnt/tmp/$(basename "${f}")"
+        for i in $(seq 1 ${{ inputs.node-count }}); do
+          # Check if the MicroShift container is running
+          if ! sudo podman ps --format "{{.Names}}" | grep -q "^microshift-okd-${i}$" ; then
+            echo "WARNING: MicroShift container number ${i} is not running - cannot collect sos report"
+            exit 0
+          fi
+
+          # Collect sos report from the MicroShift container
+          sudo podman exec -i "microshift-okd-${i}" microshift-sos-report
+          for f in $(sudo podman exec -i "microshift-okd-${i}" bash -c 'ls -1 /tmp/sosreport-*'); do
+            sudo podman cp "microshift-okd-${i}":${f} /mnt/tmp/
+            sudo chmod 644 "/mnt/tmp/$(basename "${f}")"
+          done
         done
 
     - name: Upload sos report to the GitHub Actions artifact

.github/workflows/builders.yaml

@@ -61,7 +61,7 @@ jobs:
           ushift-branch: main
           okd-version-tag: ${{ steps.detect-okd-version.outputs.okd-version-tag }}
           bootc-image-url: registry.fedoraproject.org/fedora-bootc
-          bootc-image-tag: latest
+          bootc-image-tag: 42
           build: bootc-image
           node-count: 2
 

.github/workflows/release.md

@@ -2,19 +2,32 @@
 
 #### RPM
 
-Review the instructions in [MicroShift RPMs](https://github.com/microshift-io/microshift/blob/main/docs/run.md#microshift-rpms) to install the packages and run MicroShift.
+Enable COPR repository (optionally specify chroot such as `centos-stream-9-{x86_64,aarch64}`, `fedora-42-{x86_64,aarch64}`):
+```sh
+sudo dnf copr enable $COPR_REPO_NAME [chroot]
+```
+
+Next, install MicroShift:
+```sh
+sudo dnf install -y \
+    microshift-$VERSION \
+    microshift-kindnet-$VERSION \
+    microshift-topolvm-$VERSION
+```
+
+Review the instructions in [MicroShift RPMs](https://github.com/microshift-io/microshift/blob/main/docs/run.md#microshift-rpms) to run MicroShift.
 
 #### Bootc Image
 
 Load the Bootc container image using the following command:
 
 ```bash
-sudo podman pull ghcr.io/microshift-io/microshift:$TAG
+sudo podman pull ghcr.io/microshift-io/microshift:$VERSION
 ```
 
 Or use the image with the `quickstart.sh`:
 ```bash
-curl -s https://microshift-io.github.io/microshift/quickstart.sh | sudo TAG=$TAG bash
+curl -s https://microshift-io.github.io/microshift/quickstart.sh | sudo TAG=$VERSION bash
 ```
 
 Review the instructions in [MicroShift Bootc Image](https://github.com/microshift-io/microshift/blob/main/docs/run.md#microshift-bootc-image) to run the image.

.github/workflows/release.yaml

@@ -9,17 +9,13 @@ on:
         description: MicroShift branch from https://github.com/openshift/microshift/branches
         type: string
       okd-version-tag:
-        default: "4.19.0-okd-scos.19"
+        default: "4.21.0-okd-scos.ec.5"
         description: OKD version tag from https://quay.io/repository/okd/scos-release?tab=tags
         type: string
-      build:
-        type: choice
-        description: Types of artifacts to build
-        default: all
-        options:
-        - all
-        - rpms
-        - bootc-image
+      copr-repo:
+        default: pmtk0/test123
+        description: COPR repository name
+        type: string
 
 jobs:
   build:
@@ -34,47 +30,56 @@ jobs:
       - name: Check out MicroShift upstream repository
         uses: actions/checkout@v4
 
-      - name: Run the build action
+      - name: Prepare the build and run environment
+        uses: ./.github/actions/prebuild
+
+      - name: Build MicroShift RPMs
+        shell: bash
+        env:
+          COPR_TOKEN: |
+            ${{ secrets.COPR_TOKEN }}
+        run: |
+          cd ${GITHUB_WORKSPACE}/
+          echo "${COPR_TOKEN}" > /tmp/copr-token
+          make copr-rpm \
+            USHIFT_BRANCH=${{ inputs.ushift-branch }} \
+            OKD_VERSION_TAG=${{ inputs.okd-version-tag }} \
+            RPM_OUTDIR=/mnt/rpms \
+            COPR_CONFIG=/tmp/copr-token \
+            COPR_REPO_NAME="${{ inputs.copr-repo }}"
+
+      - name: Build and test bootc image
         uses: ./.github/actions/build
         with:
           ushift-branch: ${{ inputs.ushift-branch }}
           okd-version-tag: ${{ inputs.okd-version-tag }}
-          build: ${{ inputs.build }}
-
-      # Test the local container image with the quick start and clean procedures
-      # before releasing the artifacts.
-      - name: Run the quick start script and clean scripts
-        if: contains(fromJSON('["all", "bootc-image"]'), inputs.build)
-        uses: ./.github/actions/quick-start-clean
-        with:
-          image-ref: localhost/microshift-okd:latest
+          build: bootc-image
+          rpm-builder: rpm-copr-builder
 
-        # The release process consumes the RPMs and the container image
-        # prepared by the build action.
-      - name: Prepare the RPM archives
-        if: contains(fromJSON('["all", "rpms"]'), inputs.build)
+      - name: COPR - Delete builds
+        if: failure()
         shell: bash
+        env:
+          COPR_TOKEN: |
+            ${{ secrets.COPR_TOKEN }}
         run : |
-          # Archive sources separately from the RPMs
-          sudo mv /mnt/rpms/srpms /mnt/srpms
-          cd /mnt/srpms
-          sudo tar zcvf /mnt/release/microshift-src.tgz .
-
-          cd /mnt/rpms
-          sudo tar zcvf /mnt/release/microshift-rpms-$(uname -m).tgz .
+          echo "${COPR_TOKEN}" > /tmp/copr-token
+          make copr-delete-builds \
+            COPR_CONFIG=/tmp/copr-token \
+            COPR_BUILDS="$(cat /mnt/rpms/builds.txt)"
 
-      - name: Release RPMs
-        if: contains(fromJSON('["all", "rpms"]'), inputs.build)
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ inputs.ushift-branch }}-${{ inputs.okd-version-tag }}
-          files: |
-            /mnt/release/microshift-rpms-*.tgz
-            /mnt/release/microshift-src.tgz
-          overwrite_files: true
+      - name: COPR - Regenerate RPM repo
+        shell: bash
+        env:
+          COPR_TOKEN: |
+            ${{ secrets.COPR_TOKEN }}
+        run : |
+          echo "${COPR_TOKEN}" > /tmp/copr-token
+          make copr-regenerate-repos \
+            COPR_CONFIG=/tmp/copr-token \
+            COPR_REPO_NAME="${{ inputs.copr-repo }}"
 
       - name: Login to GitHub Container Registry
-        if: contains(fromJSON('["all", "bootc-image"]'), inputs.build)
         uses: redhat-actions/podman-login@v1
         with:
           registry: ghcr.io/${{ github.repository_owner }}
@@ -83,21 +88,24 @@ jobs:
           auth_file_path: /tmp/ghcr-auth.json
 
       - name: Publish Bootc image
-        if: contains(fromJSON('["all", "bootc-image"]'), inputs.build)
+        id: publish-bootc-image
         shell: bash
         run: |
+          VERSION="$(cat /mnt/rpms/version.txt)"
           sudo podman tag microshift-okd \
-            ghcr.io/${{ github.repository }}:${{ inputs.ushift-branch }}-${{ inputs.okd-version-tag }} \
+            ghcr.io/${{ github.repository }}:${VERSION} \
             ghcr.io/${{ github.repository }}:latest
-          sudo podman push --authfile /tmp/ghcr-auth.json ghcr.io/${{ github.repository }}:${{ inputs.ushift-branch }}-${{ inputs.okd-version-tag }}
+          sudo podman push --authfile /tmp/ghcr-auth.json ghcr.io/${{ github.repository }}:${VERSION}
           sudo podman push --authfile /tmp/ghcr-auth.json ghcr.io/${{ github.repository }}:latest
 
           # Prepare the release note for the bootc image usage
-          TAG=${{ inputs.ushift-branch }}-${{ inputs.okd-version-tag }} envsubst < .github/workflows/release.md > /tmp/release.md
+          VERSION="${VERSION}" \
+          COPR_REPO_NAME="${{ inputs.copr-repo }}" \
+          envsubst < .github/workflows/release.md > /tmp/release.md
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Add release note for bootc image usage
-        if: contains(fromJSON('["all", "bootc-image"]'), inputs.build)
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ inputs.ushift-branch }}-${{ inputs.okd-version-tag }}
+          tag_name: ${{ steps.publish-bootc-image.outputs.version }}
           body_path: /tmp/release.md

Makefile

@@ -20,11 +20,14 @@ ISOLATED_NETWORK ?= 0
 
 # Internal variables
 SHELL := /bin/bash
-BUILDER_IMAGE := microshift-okd-builder
+BUILDER_IMAGE ?= rpm-local-builder
 USHIFT_IMAGE := microshift-okd
 LVM_DISK := /var/lib/microshift-okd/lvmdisk.image
 VG_NAME := myvg1
 
+PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+include $(PROJECT_DIR)/src/copr/copr.mk
+
 #
 # Define the main targets
 #
@@ -47,16 +50,23 @@ all:
 	@echo "   run-status:	show the status of the MicroShift cluster"
 	@echo "   clean-all:	perform a full cleanup, including the container images"
 	@echo ""
+	@echo "COPR related targets:"
+	@echo "   copr-rpm:		                    build the MicroShift RPMs using COPR build service"
+	@echo "   copr-delete-builds:	            delete the COPR builds using the COPR_BUILDS environment variable"
+	@echo "   copr-regenerate-repos:	        regenerate the COPR repository"
+	@echo "   copr-cfg-ensure-podman-secret:	create podman secret from COPR_CONFIG"
+	@echo "   copr-cli:		                    build the COPR CLI container image used by copr-delete-builds and copr-regenerate-repos"
+	@echo ""
 
 .PHONY: rpm
 rpm:
-	@echo "Building the MicroShift builder image"
+	@echo "Building the MicroShift RPMs"
 	sudo podman build \
         -t "${BUILDER_IMAGE}" \
         --ulimit nofile=524288:524288 \
         --build-arg USHIFT_BRANCH="${USHIFT_BRANCH}" \
         --build-arg OKD_VERSION_TAG="${OKD_VERSION_TAG}" \
-        -f packaging/microshift-builder.Containerfile .
+        -f packaging/rpm-local-builder.Containerfile .
 
 	@echo "Extracting the MicroShift RPMs"
 	outdir="$${RPM_OUTDIR:-$$(mktemp -d /tmp/microshift-rpms-XXXXXX)}" && \
@@ -80,8 +90,8 @@ rpm-to-deb:
 
 .PHONY: image
 image:
-	@if ! sudo podman image exists microshift-okd-builder ; then \
-		echo "ERROR: Run 'make rpm' to build the MicroShift RPMs" ; \
+	@if ! sudo podman image exists "${BUILDER_IMAGE}" ; then \
+		echo "ERROR: Run 'make rpm' or 'make copr-rpm' to build the MicroShift RPMs" ; \
 		exit 1 ; \
 	fi
 
@@ -93,11 +103,12 @@ image:
      	--label okd.version="${OKD_VERSION_TAG}" \
         --build-arg BOOTC_IMAGE_URL="${BOOTC_IMAGE_URL}" \
         --build-arg BOOTC_IMAGE_TAG="${BOOTC_IMAGE_TAG}" \
+		--build-arg RPM_BUILDER_IMAGE="${BUILDER_IMAGE}" \
     	--env WITH_KINDNET="${WITH_KINDNET}" \
     	--env WITH_TOPOLVM="${WITH_TOPOLVM}" \
     	--env WITH_OLM="${WITH_OLM}" \
     	--env EMBED_CONTAINER_IMAGES="${EMBED_CONTAINER_IMAGES}" \
-        -f packaging/microshift-runner.Containerfile .
+        -f packaging/bootc.Containerfile .
 
 # Notes:
 # - An isolated network is created if the ISOLATED_NETWORK environment variable is set
@@ -157,6 +168,7 @@ clean-all:
 	$(MAKE) clean
 	sudo podman rmi -f "${USHIFT_IMAGE}" || true
 	sudo podman rmi -f "${BUILDER_IMAGE}" || true
+	sudo podman rmi -f "${COPR_BUILDER_IMAGE}" || true
 
 .PHONY: check
 check: _hadolint _shellcheck