Skip to content

Conversation

@pmtk
Copy link
Contributor

@pmtk pmtk commented Dec 10, 2025

Usage:

mkdir -p /tmp/microshift-srpm-copr

# Create SRPM
make srpm SRPM_WORKDIR=/tmp/microshift-srpm-copr

# Push SRPM to COPR and store the build ID in the $SRPM_WORKDIR/build.txt
make copr-create-build COPR_REPO_NAME=USER/PROJECT SRPM_WORKDIR=/tmp/microshift-srpm-copr

# Wait until build is finished
make copr-watch-build SRPM_WORKDIR=/tmp/microshift-srpm-copr

# Create a container image with the RPMs from COPR for usage in runner image
make rpm-copr SRPM_WORKDIR=/tmp/microshift-srpm-copr 

# Build runner image with builder override
make image BUILDER_IMAGE=rpm-copr-builder

Part of #71

Summary by CodeRabbit

  • New Features

    • Added COPR (Community Projects) build workflow with new commands for creating, watching, and managing builds
    • Build system now supports multiple RPM build pathways (traditional and COPR-based)
    • RPM image reference configurable for flexible build configuration
  • Build System Updates

    • GitHub Actions workflows enhanced for COPR integration
    • Build environment expanded to support COPR-based operations

✏️ Tip: You can customize this high-level summary in your review settings.

@pmtk pmtk requested a review from a team as a code owner December 10, 2025 12:04
@coderabbitai
Copy link

coderabbitai bot commented Dec 10, 2025

📝 Walkthrough

Walkthrough

This PR introduces COPR (Community Projects) RPM build integration, adding containerized workflows, Makefile targets, and GitHub Actions to support building MicroShift RPMs via COPR service alongside the existing local build pipeline. RPM_IMAGE is made overridable across build stages.

Changes

Cohort / File(s) Summary
Makefile Configuration
Makefile
Made RPM_IMAGE overridable with ?=, added PROJECT_DIR computation, included copr.mk, updated image target to reference both RPM build paths (rpm and rpm-copr), and propagated RPM_IMAGE as a build-arg to bootc image.
COPR Build Infrastructure
src/copr/copr.mk, src/copr/create-build.sh, src/copr/copr-cli.Containerfile
Introduced complete COPR workflow: copr.mk defines 8 new targets (copr-help, rpm-copr, copr-cli, copr-cfg-ensure-podman-secret, copr-create-build, copr-watch-build, copr-delete-build, copr-regenerate-repos) with configuration variables; create-build.sh script extracts COPR build IDs and writes to /srpms/build.txt; copr-cli.Containerfile provides lightweight COPR CLI container.
RPM Build Containers
packaging/rpms-copr.Containerfile, packaging/bootc.Containerfile
New rpms-copr.Containerfile implements COPR download and RPM extraction workflow on Fedora 42; bootc.Containerfile updated to accept RPM_IMAGE build-arg instead of hardcoded image reference.
GitHub Actions Workflow
.github/actions/build/action.yaml, .github/actions/prebuild/action.yaml, .github/workflows/release.yaml
Added rpm-image input to build action; added /mnt/srpm directory in prebuild; release.yaml reworked to support COPR build flow with SRPM creation, build creation/watching, artifact persistence, and repository regeneration steps; conditional gating adjusted.

Sequence Diagram(s)

sequenceDiagram
    actor User
    participant Make as make rpm-copr
    participant Podman as Podman
    participant CoprCli as COPR CLI<br/>Container
    participant CoprSvc as COPR Service
    participant Builder as Builder<br/>Container
    participant Repo as RPM Repo

    User->>Make: Invoke rpm-copr
    Make->>Podman: Create secret from config
    Make->>Podman: Build copr-cli image
    Make->>CoprCli: Mount SRPMs + run create-build.sh
    CoprCli->>CoprSvc: Create build (copr-cli)
    CoprSvc-->>CoprCli: Build ID
    CoprCli-->>Make: Extract & store build ID
    Make->>CoprCli: Watch build progress (copr-cli)
    CoprCli->>CoprSvc: Poll build status
    CoprSvc-->>CoprCli: Build complete
    Make->>Builder: Extract RPMs from<br/>COPR via podman run
    Builder->>CoprSvc: Download built RPMs
    CoprSvc-->>Builder: RPMs
    Builder->>Repo: Move RPMs to repo path
    Builder->>Repo: Regenerate metadata
    Make-->>User: Success
Loading

Estimated Code Review Effort

🎯 4 (Complex) | ⏱️ ~45 minutes

Possibly Related PRs

Suggested Reviewers

  • ggiguash
  • praveenkumar
  • agullon
🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'Building RPMs using COPR' directly and clearly describes the main purpose of this changeset—adding COPR workflow support for RPM builds.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches
  • 📝 Generate docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 5

🧹 Nitpick comments (2)
packaging/rpms-copr.Containerfile (1)

14-14: Hardcoded chroot limits flexibility.

The epel-9 chroot is hardcoded. Consider making it configurable via an ARG for different target distributions.

Apply this diff to make the chroot configurable:

 ARG COPR_BUILD_ID=
 ARG BUILDER_RPM_REPO_PATH=/home/microshift/microshift/_output/rpmbuild/RPMS
+ARG COPR_CHROOT=epel-9
 
 # hadolint ignore=DL3003,DL4006,SC3040
 RUN <<EOT bash
     set -xeuo pipefail
-    copr download-build --rpms --chroot "epel-9-$(uname -m)" --dest /tmp/rpms ${COPR_BUILD_ID}
+    copr download-build --rpms --chroot "${COPR_CHROOT}-$(uname -m)" --dest /tmp/rpms ${COPR_BUILD_ID}
     mkdir -p /home/microshift/microshift
-    cd /tmp/rpms/"epel-9-$(uname -m)"/
+    cd /tmp/rpms/"${COPR_CHROOT}-$(uname -m)"/
     rpm2cpio microshift-*.src.rpm | cpio -idmv
     tar xf microshift-*.tar.gz -C /home/microshift/microshift --strip-components=1
     mkdir -p ${BUILDER_RPM_REPO_PATH}
-    mv /tmp/rpms/"epel-9-$(uname -m)"/*.rpm ${BUILDER_RPM_REPO_PATH}/
+    mv /tmp/rpms/"${COPR_CHROOT}-$(uname -m)"/*.rpm ${BUILDER_RPM_REPO_PATH}/
     createrepo -v ${BUILDER_RPM_REPO_PATH}
     rm -rf /tmp/rpms
 EOT
src/copr/create-build.sh (1)

4-11: Consider using JSON output format instead of parsing text.

The code parses copr-cli output with grep and cut, which is fragile if the output format changes. The copr-cli tool supports --output-format json for the build command, providing structured output that eliminates this parsing fragility.

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d1cc1c5 and 551ee5d.

📒 Files selected for processing (6)
  • Makefile (3 hunks)
  • packaging/microshift-runner.Containerfile (1 hunks)
  • packaging/rpms-copr.Containerfile (1 hunks)
  • src/copr/copr-cli.Containerfile (1 hunks)
  • src/copr/copr.mk (1 hunks)
  • src/copr/create-build.sh (1 hunks)
🧰 Additional context used
🧠 Learnings (5)
📓 Common learnings
Learnt from: pmtk
Repo: microshift-io/microshift PR: 151
File: docs/workflows.md:74-76
Timestamp: 2025-12-04T13:35:05.230Z
Learning: The COPR group microshift-io/microshift exists at https://copr.fedorainfracloud.org/coprs/g/microshift-io/microshift/ and is used for publishing MicroShift RPM packages in the microshift-io/microshift repository.
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 57
File: .github/workflows/builders.yaml:75-84
Timestamp: 2025-10-17T10:53:08.461Z
Learning: In the microshift repository, the RPM-to-Debian conversion workflow follows this pattern: `convert.sh` receives an RPM directory as input and outputs .deb files to a `deb/` subdirectory within that directory. The `install.sh` script expects to receive the parent RPM directory (not the deb subdirectory) and uses recursive `find` commands to locate the .deb files in subdirectories.
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 137
File: src/quickrpm.sh:83-98
Timestamp: 2025-11-26T06:46:33.353Z
Learning: In the microshift-io/microshift repository, the quickrpm.sh script only supports RHEL 9 or above (and equivalent CentOS/Fedora versions), where util-linux includes the `--nooverlap` flag for losetup.
📚 Learning: 2025-10-17T07:44:32.742Z
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 92
File: .github/workflows/release.yaml:44-50
Timestamp: 2025-10-17T07:44:32.742Z
Learning: When Podman builds an image without a registry prefix (e.g., `podman build -t microshift-okd`), it automatically adds the `localhost/` prefix and `:latest` tag, resulting in `localhost/microshift-okd:latest`. This means the Makefile in microshift-io/microshift building with `-t microshift-okd` produces `localhost/microshift-okd:latest` without explicit retagging.

Applied to files:

  • packaging/microshift-runner.Containerfile
  • src/copr/copr.mk
  • Makefile
📚 Learning: 2025-12-04T13:35:05.230Z
Learnt from: pmtk
Repo: microshift-io/microshift PR: 151
File: docs/workflows.md:74-76
Timestamp: 2025-12-04T13:35:05.230Z
Learning: The COPR group microshift-io/microshift exists at https://copr.fedorainfracloud.org/coprs/g/microshift-io/microshift/ and is used for publishing MicroShift RPM packages in the microshift-io/microshift repository.

Applied to files:

  • src/copr/create-build.sh
  • packaging/rpms-copr.Containerfile
  • src/copr/copr.mk
  • src/copr/copr-cli.Containerfile
  • Makefile
📚 Learning: 2025-10-17T10:53:08.461Z
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 57
File: .github/workflows/builders.yaml:75-84
Timestamp: 2025-10-17T10:53:08.461Z
Learning: In the microshift repository, the RPM-to-Debian conversion workflow follows this pattern: `convert.sh` receives an RPM directory as input and outputs .deb files to a `deb/` subdirectory within that directory. The `install.sh` script expects to receive the parent RPM directory (not the deb subdirectory) and uses recursive `find` commands to locate the .deb files in subdirectories.

Applied to files:

  • src/copr/create-build.sh
  • packaging/rpms-copr.Containerfile
  • src/copr/copr.mk
📚 Learning: 2025-11-26T06:46:33.353Z
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 137
File: src/quickrpm.sh:83-98
Timestamp: 2025-11-26T06:46:33.353Z
Learning: In the microshift-io/microshift repository, the quickrpm.sh script only supports RHEL 9 or above (and equivalent CentOS/Fedora versions), where util-linux includes the `--nooverlap` flag for losetup.

Applied to files:

  • src/copr/create-build.sh
  • packaging/rpms-copr.Containerfile
🔇 Additional comments (14)
packaging/microshift-runner.Containerfile (1)

4-6: LGTM!

The ARG makes the builder image configurable while maintaining backward compatibility with the default value.

src/copr/create-build.sh (1)

1-2: LGTM!

Proper error handling with set -euo pipefail.

packaging/rpms-copr.Containerfile (1)

1-6: LGTM!

Good practices: disabling weak dependencies and cleaning DNF cache.

Makefile (4)

39-39: LGTM!

Making BUILDER_IMAGE overridable enables the COPR workflow while maintaining backward compatibility.


45-46: LGTM!

Standard approach for computing project directory and modular include.


119-120: LGTM!

Clear error message guiding users to both RPM build workflows.


132-132: LGTM!

Correctly propagates BUILDER_IMAGE to the container build as RPM_BUILDER_IMAGE.

src/copr/copr.mk (6)

10-34: LGTM!

Excellent documentation of the COPR workflow with clear step-by-step instructions.


35-51: LGTM!

Target structure mirrors the main rpm target, maintaining consistency.


52-58: LGTM!

Proper secret management: removes stale secret before creating new one.


60-66: LGTM!

Simple CLI container build.


67-75: LGTM!

Proper dependencies and secret handling for delete operation.


76-84: LGTM!

Correct implementation for repo regeneration.

src/copr/copr-cli.Containerfile (1)

1-1: No action required. Fedora 42 was released on April 15, 2025, and is available as a base image.

Comment on lines +8 to +9
ARG COPR_BUILD_ID=
ARG BUILDER_RPM_REPO_PATH=/home/microshift/microshift/_output/rpmbuild/RPMS
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Validate COPR_BUILD_ID is provided.

COPR_BUILD_ID is required but has an empty default. The script should fail early if not provided.

Add validation after the ARG declarations:

 ARG COPR_BUILD_ID=
 ARG BUILDER_RPM_REPO_PATH=/home/microshift/microshift/_output/rpmbuild/RPMS
 
+RUN if [ -z "${COPR_BUILD_ID}" ]; then \
+        echo "ERROR: COPR_BUILD_ID build argument is required" >&2; \
+        exit 1; \
+    fi
+
 # hadolint ignore=DL3003,DL4006,SC3040

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents
In packaging/rpms-copr.Containerfile around lines 8 to 9, ARG COPR_BUILD_ID is
declared with an empty default but is required; add a validation immediately
after the ARG declarations that checks if COPR_BUILD_ID is empty and, if so,
prints a clear error message and exits non‑zero to fail the build early (e.g.,
test the variable and call exit 1). Ensure the validation runs during image
build so the Docker/Cool variant fails fast when COPR_BUILD_ID is not provided.

@@ -0,0 +1,104 @@
COPR_CONFIG ?= $(HOME)/.config/copr
COPR_REPO_NAME ?= "@microshift-io/microshift"
COPR_BUILD_ID ?= $$(cat "${SRPM_WORKDIR}/build.txt")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Validate SRPM_WORKDIR before reading build.txt.

COPR_BUILD_ID reads from ${SRPM_WORKDIR}/build.txt but SRPM_WORKDIR may not be set or the file may not exist. Targets using COPR_BUILD_ID should validate this.

Add validation to targets that use COPR_BUILD_ID:

 .PHONY: rpm-copr
 rpm-copr:
+	@if [ -z "${SRPM_WORKDIR}" ]; then \
+		echo "ERROR: SRPM_WORKDIR is not set" ; \
+		exit 1 ; \
+	fi
+	@if [ ! -f "${SRPM_WORKDIR}/build.txt" ]; then \
+		echo "ERROR: ${SRPM_WORKDIR}/build.txt not found. Run 'make copr-create-build' first" ; \
+		exit 1 ; \
+	fi
 	@echo "Building MicroShift RPM image using COPR"

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents
In src/copr/copr.mk around line 3, COPR_BUILD_ID is unconditionally defined by
reading "${SRPM_WORKDIR}/build.txt" which can fail if SRPM_WORKDIR is unset or
the file doesn't exist; update the Makefile so targets that use COPR_BUILD_ID
first validate SRPM_WORKDIR is set and that "${SRPM_WORKDIR}/build.txt" exists
before attempting to read it, and emit a clear make error (or skip/handle
gracefully) if validation fails; implement this by moving the file-read into a
recipe or guarded shell expression used by those targets (or by making
COPR_BUILD_ID empty by default and having targets perform a check using test -n
and test -f and failing with @echo and exit 1 when missing).

Comment on lines +85 to +96
.PHONY: copr-create-build
copr-create-build: copr-cfg-ensure-podman-secret copr-cli
@echo "Creating the COPR build"
sudo podman run \
--rm \
--secret ${COPR_SECRET_NAME} \
--env COPR_REPO_NAME="${COPR_REPO_NAME}" \
--volume "${SRPM_WORKDIR}:/srpms:Z" \
--volume "./src/copr/create-build.sh:/create-build.sh:Z" \
"${COPR_CLI_IMAGE}" \
bash -c "bash -x /create-build.sh"

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Validate SRPM_WORKDIR in copr-create-build.

The target mounts ${SRPM_WORKDIR} but doesn't validate it's set or that the directory exists.

Add validation at the start of the target:

 .PHONY: copr-create-build
 copr-create-build: copr-cfg-ensure-podman-secret copr-cli
+	@if [ -z "${SRPM_WORKDIR}" ]; then \
+		echo "ERROR: SRPM_WORKDIR is not set" ; \
+		exit 1 ; \
+	fi
+	@if [ ! -d "${SRPM_WORKDIR}" ]; then \
+		echo "ERROR: ${SRPM_WORKDIR} directory not found" ; \
+		exit 1 ; \
+	fi
 	@echo "Creating the COPR build"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
.PHONY: copr-create-build
copr-create-build: copr-cfg-ensure-podman-secret copr-cli
@echo "Creating the COPR build"
sudo podman run \
--rm \
--secret ${COPR_SECRET_NAME} \
--env COPR_REPO_NAME="${COPR_REPO_NAME}" \
--volume "${SRPM_WORKDIR}:/srpms:Z" \
--volume "./src/copr/create-build.sh:/create-build.sh:Z" \
"${COPR_CLI_IMAGE}" \
bash -c "bash -x /create-build.sh"
.PHONY: copr-create-build
copr-create-build: copr-cfg-ensure-podman-secret copr-cli
@if [ -z "${SRPM_WORKDIR}" ]; then \
echo "ERROR: SRPM_WORKDIR is not set" ; \
exit 1 ; \
fi
@if [ ! -d "${SRPM_WORKDIR}" ]; then \
echo "ERROR: ${SRPM_WORKDIR} directory not found" ; \
exit 1 ; \
fi
@echo "Creating the COPR build"
sudo podman run \
--rm \
--secret ${COPR_SECRET_NAME} \
--env COPR_REPO_NAME="${COPR_REPO_NAME}" \
--volume "${SRPM_WORKDIR}:/srpms:Z" \
--volume "./src/copr/create-build.sh:/create-build.sh:Z" \
"${COPR_CLI_IMAGE}" \
bash -c "bash -x /create-build.sh"
🤖 Prompt for AI Agents
In src/copr/copr.mk around lines 85 to 96, the copr-create-build target mounts
${SRPM_WORKDIR} but does not validate that SRPM_WORKDIR is set or that the
directory exists; add a validation at the start of the target that (1) verifies
the SRPM_WORKDIR variable is non-empty and (2) verifies the path exists and is a
directory, and if either check fails, print a clear error to stderr and exit the
recipe with a non-zero status so the make target aborts before running podman.
Use simple shell checks (e.g., [ -n "${SRPM_WORKDIR}" ] and [ -d
"${SRPM_WORKDIR}" ]) and ensure the error message references the variable name
and the failing condition.

Comment on lines +97 to +104
.PHONY: copr-watch-build
copr-watch-build: copr-cli
@echo "Watching the COPR build"
sudo podman run \
--rm \
--volume "${SRPM_WORKDIR}:/srpms:Z" \
"${COPR_CLI_IMAGE}" \
bash -c "copr-cli watch-build \$$(cat /srpms/build.txt)"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Validate SRPM_WORKDIR in copr-watch-build.

The target reads ${SRPM_WORKDIR}/build.txt but doesn't validate the directory or file exists.

Add validation:

 .PHONY: copr-watch-build
 copr-watch-build: copr-cli
+	@if [ -z "${SRPM_WORKDIR}" ]; then \
+		echo "ERROR: SRPM_WORKDIR is not set" ; \
+		exit 1 ; \
+	fi
+	@if [ ! -f "${SRPM_WORKDIR}/build.txt" ]; then \
+		echo "ERROR: ${SRPM_WORKDIR}/build.txt not found. Run 'make copr-create-build' first" ; \
+		exit 1 ; \
+	fi
 	@echo "Watching the COPR build"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
.PHONY: copr-watch-build
copr-watch-build: copr-cli
@echo "Watching the COPR build"
sudo podman run \
--rm \
--volume "${SRPM_WORKDIR}:/srpms:Z" \
"${COPR_CLI_IMAGE}" \
bash -c "copr-cli watch-build \$$(cat /srpms/build.txt)"
.PHONY: copr-watch-build
copr-watch-build: copr-cli
@if [ -z "${SRPM_WORKDIR}" ]; then \
echo "ERROR: SRPM_WORKDIR is not set" ; \
exit 1 ; \
fi
@if [ ! -f "${SRPM_WORKDIR}/build.txt" ]; then \
echo "ERROR: ${SRPM_WORKDIR}/build.txt not found. Run 'make copr-create-build' first" ; \
exit 1 ; \
fi
@echo "Watching the COPR build"
sudo podman run \
--rm \
--volume "${SRPM_WORKDIR}:/srpms:Z" \
"${COPR_CLI_IMAGE}" \
bash -c "copr-cli watch-build \$$(cat /srpms/build.txt)"
🤖 Prompt for AI Agents
In src/copr/copr.mk around lines 97 to 104, the copr-watch-build target uses
${SRPM_WORKDIR}/build.txt without validating that SRPM_WORKDIR exists or that
build.txt is present; add a check before running podman that SRPM_WORKDIR is a
directory and that "${SRPM_WORKDIR}/build.txt" is a readable file, printing a
clear error and exiting with non‑zero status if either check fails, then proceed
to run the podman command only when both checks pass.

#!/usr/bin/env bash
set -euo pipefail

out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Handle glob expansion failure.

If no SRPM files match microshift*.src.rpm, the command will fail with an unclear error.

Apply this diff to validate the SRPM exists:

+if ! ls /srpms/microshift*.src.rpm 1> /dev/null 2>&1; then
+    echo "ERROR: No SRPM files found matching /srpms/microshift*.src.rpm"
+    exit 1
+fi
+
 out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
if ! ls /srpms/microshift*.src.rpm 1> /dev/null 2>&1; then
echo "ERROR: No SRPM files found matching /srpms/microshift*.src.rpm"
exit 1
fi
out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
🤖 Prompt for AI Agents
In src/copr/create-build.sh around line 4, the copr-cli command assumes the glob
/srpms/microshift*.src.rpm expands to at least one file; if it doesn't the
command fails with an unclear error. Before invoking copr-cli, test whether any
files match that glob (e.g., capture the glob expansion into a variable or
array, check its length), and if none are found print a clear error and exit
non‑zero; otherwise pass the expanded file path(s) to copr-cli (properly
quoted/iterated to handle spaces) so the command only runs when SRPM(s) actually
exist.

@ggiguash ggiguash marked this pull request as draft December 13, 2025 11:26
@pmtk pmtk force-pushed the copr-local branch 3 times, most recently from d408e73 to daad6a9 Compare January 13, 2026 15:15
@pmtk pmtk force-pushed the copr-local branch 3 times, most recently from aae666c to 97d4fab Compare January 14, 2026 10:24
@pmtk pmtk marked this pull request as ready for review January 14, 2026 12:55
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 5

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
.github/workflows/release.yaml (1)

227-234: inputs.build is undefined – conditionals will always evaluate to false.

The workflow defines ushift-gitref, okd-version-tag, and copr-repo inputs, but lines 228 and 234 reference inputs.build which doesn't exist. These steps will be skipped.

      - name: Login to GitHub Container Registry
-       if: contains(fromJSON('["all", "bootc-image"]'), inputs.build)
+       # Remove condition or add 'build' input if selective behavior is needed
        uses: ./.github/actions/podman-login

      - name: Publish Bootc container image manifest
-       if: contains(fromJSON('["all", "bootc-image"]'), inputs.build)
+       # Remove condition or add 'build' input if selective behavior is needed
        shell: bash
🤖 Fix all issues with AI agents
In @.github/actions/build/action.yaml:
- Line 48: The workflow conditional is referencing the wrong input name: update
the if expression that currently uses "inputs.rpm-builder" to use the correct
input identifier "inputs.rpm-image" so the branch evaluating "==
'microshift-okd-rpm'" works as intended; locate the conditional expression (the
if: inputs.rpm-builder == 'microshift-okd-rpm' line) and replace rpm-builder
with rpm-image.
- Line 52: The conditional uses the wrong input name: change the occurrence of
"if: inputs.rpm-builder == 'microshift-okd-rpm'" to use the correct input key
"rpm-image" (e.g., "if: inputs.rpm-image == 'microshift-okd-rpm'") so the action
reads the intended input; update any other references of "rpm-builder" in this
file to "rpm-image" to keep names consistent.

In `@packaging/rpms-copr.Containerfile`:
- Around line 11-18: The RUN block contains a shell cd (cd
/tmp/rpms/"epel-9-$(uname -m)"/) which triggers hadolint DL3003; either add
DL3003 to the hadolint ignore list on that RUN (augment the existing "# hadolint
ignore=DL4006" to include DL3003) or refactor the RUN to avoid cd (use absolute
paths or a subshell/pushd/popd pattern) so the DL3003 violation is removed;
update the RUN block containing the cd command accordingly.

In `@src/copr/create-build.sh`:
- Around line 1-4: The script src/copr/create-build.sh uses the COPR_REPO_NAME
variable without verifying it is non-empty; add an explicit validation at the
top of the script (before calling copr-cli) that checks COPR_REPO_NAME is set
and not empty, prints a clear error message to stderr (including the variable
name) and exits non-zero if the check fails, then proceed to run the existing
copr-cli build command; reference COPR_REPO_NAME and the copr-cli invocation
when adding the guard.
♻️ Duplicate comments (3)
src/copr/create-build.sh (1)

4-4: Handle glob expansion failure.

If no SRPM files match microshift*.src.rpm, the command fails with an unclear error.

Proposed fix
+shopt -s nullglob
+srpms=(/srpms/microshift*.src.rpm)
+shopt -u nullglob
+if [[ ${`#srpms`[@]} -eq 0 ]]; then
+    echo "ERROR: No SRPM files found matching /srpms/microshift*.src.rpm"
+    exit 1
+fi
+
-out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
+out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" "${srpms[@]}")"
packaging/rpms-copr.Containerfile (1)

8-9: Validate COPR_BUILD_ID is provided.

COPR_BUILD_ID has an empty default but is required. The build should fail early if not provided.

Proposed fix
 ARG COPR_BUILD_ID=
 ARG BUILDER_RPM_REPO_PATH=/home/microshift/microshift/_output/rpmbuild/RPMS

+RUN if [ -z "${COPR_BUILD_ID}" ]; then \
+        echo "ERROR: COPR_BUILD_ID build argument is required" >&2; \
+        exit 1; \
+    fi
+
 # hadolint ignore=DL4006
src/copr/copr.mk (1)

85-104: SRPM_WORKDIR validation still missing.

Previous review comments requested validation that SRPM_WORKDIR is set and exists before these targets run. This remains unaddressed.

🧹 Nitpick comments (1)
.github/workflows/release.yaml (1)

24-73: COPR build job looks correct.

The sequence follows the required pattern: SRPM build → COPR create → watch. Artifacts are properly persisted for downstream jobs.

One minor note: the COPR_CONFIG secret is written to /tmp/copr-config without restrictive permissions. Consider adding chmod 600 after writing.

Suggested improvement
          echo "${COPR_CONFIG}" > /tmp/copr-config
+         chmod 600 /tmp/copr-config
📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 551ee5d and 97d4fab.

📒 Files selected for processing (9)
  • .github/actions/build/action.yaml
  • .github/actions/prebuild/action.yaml
  • .github/workflows/release.yaml
  • Makefile
  • packaging/bootc.Containerfile
  • packaging/rpms-copr.Containerfile
  • src/copr/copr-cli.Containerfile
  • src/copr/copr.mk
  • src/copr/create-build.sh
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/copr/copr-cli.Containerfile
🧰 Additional context used
📓 Path-based instructions (3)
Makefile

📄 CodeRabbit inference engine (CLAUDE.md)

Build system follows three sequential stages: SRPM Build (make srpm), RPM Build (make rpm), and Bootc Image (make image). Each stage must be completed before the next can be executed.

Files:

  • Makefile
**/*.sh

📄 CodeRabbit inference engine (CLAUDE.md)

**/*.sh: Shell scripts should pass linting with shellcheck as part of the make check validation step
Build scripts must detect architecture automatically via uname -m to determine between x86_64 or aarch64

Files:

  • src/copr/create-build.sh
.github/workflows/*.yaml

📄 CodeRabbit inference engine (CLAUDE.md)

CI/CD workflows should validate builds with builders.yaml, test quickstart scripts with installers.yaml, support manual release workflow via release.yaml, and run daily OKD ARM builds via release-okd.yaml

Files:

  • .github/workflows/release.yaml
🧠 Learnings (16)
📓 Common learnings
Learnt from: pmtk
Repo: microshift-io/microshift PR: 151
File: docs/workflows.md:74-76
Timestamp: 2025-12-04T13:35:05.230Z
Learning: The COPR group microshift-io/microshift exists at https://copr.fedorainfracloud.org/coprs/g/microshift-io/microshift/ and is used for publishing MicroShift RPM packages in the microshift-io/microshift repository.
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to packaging/Containerfile* : SRPM build container must clone MicroShift from upstream repository at `USHIFT_GITREF` and replace component images with OKD references via `src/image/prebuild.sh`
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 57
File: .github/workflows/builders.yaml:75-84
Timestamp: 2025-10-17T10:53:08.461Z
Learning: In the microshift repository, the RPM-to-Debian conversion workflow follows this pattern: `convert.sh` receives an RPM directory as input and outputs .deb files to a `deb/` subdirectory within that directory. The `install.sh` script expects to receive the parent RPM directory (not the deb subdirectory) and uses recursive `find` commands to locate the .deb files in subdirectories.
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to packaging/Containerfile* : RPM build container requires SRPM image from previous stage and outputs to `RPM_OUTDIR`
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to packaging/Containerfile* : Bootc image build requires RPM image from previous stage, is configurable via `WITH_KINDNET`, `WITH_TOPOLVM`, `WITH_OLM`, and `EMBED_CONTAINER_IMAGES`, and is based on `BOOTC_IMAGE_URL:BOOTC_IMAGE_TAG`
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to src/image/prebuild.sh : Replace component images with OKD references during SRPM build stage
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to ansible/** : Ansible roles should support automated builds and deployments for both containerized and host-based MicroShift installations
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to src/image/prebuild.sh : Replace component images with OKD references during SRPM build stage

Applied to files:

  • .github/actions/prebuild/action.yaml
  • packaging/bootc.Containerfile
  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • src/copr/create-build.sh
  • .github/workflows/release.yaml
  • src/copr/copr.mk
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to packaging/Containerfile* : RPM build container requires SRPM image from previous stage and outputs to `RPM_OUTDIR`

Applied to files:

  • .github/actions/prebuild/action.yaml
  • packaging/bootc.Containerfile
  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • src/copr/create-build.sh
  • .github/workflows/release.yaml
  • src/copr/copr.mk
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Always build SRPM before RPM, and RPM before bootc image to maintain dependency chain

Applied to files:

  • .github/actions/prebuild/action.yaml
  • packaging/bootc.Containerfile
  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • .github/workflows/release.yaml
  • src/copr/copr.mk
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to src/rpm/** : RPM installation scripts should manage repository creation/deletion and execute post-install configuration before service start

Applied to files:

  • .github/actions/prebuild/action.yaml
  • packaging/rpms-copr.Containerfile
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to packaging/Containerfile* : Bootc image build requires RPM image from previous stage, is configurable via `WITH_KINDNET`, `WITH_TOPOLVM`, `WITH_OLM`, and `EMBED_CONTAINER_IMAGES`, and is based on `BOOTC_IMAGE_URL:BOOTC_IMAGE_TAG`

Applied to files:

  • packaging/bootc.Containerfile
  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • .github/workflows/release.yaml
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to packaging/Containerfile* : SRPM build container must clone MicroShift from upstream repository at `USHIFT_GITREF` and replace component images with OKD references via `src/image/prebuild.sh`

Applied to files:

  • packaging/bootc.Containerfile
  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • src/copr/create-build.sh
  • .github/workflows/release.yaml
  • src/copr/copr.mk
📚 Learning: 2025-10-17T07:44:32.742Z
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 92
File: .github/workflows/release.yaml:44-50
Timestamp: 2025-10-17T07:44:32.742Z
Learning: When Podman builds an image without a registry prefix (e.g., `podman build -t microshift-okd`), it automatically adds the `localhost/` prefix and `:latest` tag, resulting in `localhost/microshift-okd:latest`. This means the Makefile in microshift-io/microshift building with `-t microshift-okd` produces `localhost/microshift-okd:latest` without explicit retagging.

Applied to files:

  • packaging/bootc.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • .github/workflows/release.yaml
  • src/copr/copr.mk
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to Makefile : Build system follows three sequential stages: SRPM Build (`make srpm`), RPM Build (`make rpm`), and Bootc Image (`make image`). Each stage must be completed before the next can be executed.

Applied to files:

  • packaging/bootc.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • .github/workflows/release.yaml
  • src/copr/copr.mk
📚 Learning: 2025-12-04T13:35:05.230Z
Learnt from: pmtk
Repo: microshift-io/microshift PR: 151
File: docs/workflows.md:74-76
Timestamp: 2025-12-04T13:35:05.230Z
Learning: The COPR group microshift-io/microshift exists at https://copr.fedorainfracloud.org/coprs/g/microshift-io/microshift/ and is used for publishing MicroShift RPM packages in the microshift-io/microshift repository.

Applied to files:

  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • src/copr/create-build.sh
  • .github/workflows/release.yaml
  • src/copr/copr.mk
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to packaging/Containerfile* : Containerfiles should pass linting with hadolint as part of the `make check` validation step

Applied to files:

  • packaging/rpms-copr.Containerfile
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to ansible/** : Ansible roles should support automated builds and deployments for both containerized and host-based MicroShift installations

Applied to files:

  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • .github/workflows/release.yaml
📚 Learning: 2025-10-17T10:53:08.461Z
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 57
File: .github/workflows/builders.yaml:75-84
Timestamp: 2025-10-17T10:53:08.461Z
Learning: In the microshift repository, the RPM-to-Debian conversion workflow follows this pattern: `convert.sh` receives an RPM directory as input and outputs .deb files to a `deb/` subdirectory within that directory. The `install.sh` script expects to receive the parent RPM directory (not the deb subdirectory) and uses recursive `find` commands to locate the .deb files in subdirectories.

Applied to files:

  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • Makefile
  • src/copr/create-build.sh
  • .github/workflows/release.yaml
  • src/copr/copr.mk
📚 Learning: 2025-11-26T06:46:33.353Z
Learnt from: ggiguash
Repo: microshift-io/microshift PR: 137
File: src/quickrpm.sh:83-98
Timestamp: 2025-11-26T06:46:33.353Z
Learning: In the microshift-io/microshift repository, the quickrpm.sh script only supports RHEL 9 or above (and equivalent CentOS/Fedora versions), where util-linux includes the `--nooverlap` flag for losetup.

Applied to files:

  • packaging/rpms-copr.Containerfile
  • .github/actions/build/action.yaml
  • src/copr/create-build.sh
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to .github/workflows/*.yaml : CI/CD workflows should validate builds with `builders.yaml`, test quickstart scripts with `installers.yaml`, support manual release workflow via `release.yaml`, and run daily OKD ARM builds via `release-okd.yaml`

Applied to files:

  • .github/actions/build/action.yaml
  • .github/workflows/release.yaml
📚 Learning: 2025-12-13T11:22:03.985Z
Learnt from: CR
Repo: microshift-io/microshift PR: 0
File: CLAUDE.md:0-0
Timestamp: 2025-12-13T11:22:03.985Z
Learning: Applies to src/okd/** : OKD version auto-detection should query latest-amd64 or latest-arm64 tags based on detected architecture

Applied to files:

  • Makefile
  • .github/workflows/release.yaml
🪛 GitHub Actions: linters
packaging/rpms-copr.Containerfile

[error] 12-12: Hadolint failed on containerfile with DL3003: Use WORKDIR to switch to a directory. (This is reported as a warning by Hadolint, but the step exited with an error in the CI pipeline.)

🔇 Additional comments (15)
.github/actions/prebuild/action.yaml (1)

31-31: LGTM!

Adding /mnt/srpm aligns with the COPR workflow's SRPM_WORKDIR usage.

packaging/bootc.Containerfile (1)

4-6: LGTM!

The RPM_IMAGE build argument enables flexible RPM source selection while maintaining backward compatibility with the default microshift-okd-rpm.

src/copr/create-build.sh (1)

6-10: LGTM!

Build ID extraction with proper error handling.

.github/actions/build/action.yaml (2)

34-37: LGTM!

The rpm-image input enables flexible RPM image selection for COPR workflows.


79-83: LGTM!

Correctly propagates RPM_IMAGE to the bootc image build.

packaging/rpms-copr.Containerfile (1)

14-14: LGTM on architecture detection.

Using uname -m for architecture detection aligns with coding guidelines.

Makefile (3)

41-48: LGTM – COPR integration cleanly wired in.

Making RPM_IMAGE overridable with ?= enables the COPR workflow path. The PROJECT_DIR pattern is idiomatic and the include is correctly placed.


121-121: Good UX improvement.

Error message now guides users to both RPM build paths.


133-133: Correct build-arg addition.

Passing RPM_IMAGE as a build-arg enables the bootc stage to consume RPMs from either local or COPR builds.

.github/workflows/release.yaml (2)

18-21: COPR repo input properly configured.

Default matches the known COPR group. Based on learnings, this aligns with the existing @microshift-io/microshift COPR repository.


253-262: COPR regenerate step properly placed in release flow.

Regenerating repos after successful builds ensures package availability. Same suggestion applies here: add chmod 600 after writing the config file.

src/copr/copr.mk (4)

1-7: Variables and defaults look reasonable.

The $$() in COPR_BUILD_ID correctly defers shell expansion to recipe time.


10-33: Helpful documentation for the COPR workflow.

The copr-help target provides clear usage guidance aligned with the PR description.


52-58: Secret rotation approach is correct.

Deleting and recreating ensures the secret reflects the current config file state.


67-83: COPR CLI invocations look correct.

Both copr-delete-build and copr-regenerate-repos properly use the secret and CLI image.

✏️ Tip: You can disable this entire section by setting review_details to false in your review settings.


- name: Prepare the build and run environment
uses: ./.github/actions/prebuild
if: inputs.rpm-builder == 'microshift-okd-rpm'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Fix incorrect input reference: rpm-builder should be rpm-image.

The condition references inputs.rpm-builder but the input is named rpm-image (line 34). This will cause the condition to always evaluate as false.

Proposed fix
-      if: inputs.rpm-builder == 'microshift-okd-rpm'
+      if: inputs.rpm-image == 'microshift-okd-rpm'
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if: inputs.rpm-builder == 'microshift-okd-rpm'
if: inputs.rpm-image == 'microshift-okd-rpm'
🤖 Prompt for AI Agents
In @.github/actions/build/action.yaml at line 48, The workflow conditional is
referencing the wrong input name: update the if expression that currently uses
"inputs.rpm-builder" to use the correct input identifier "inputs.rpm-image" so
the branch evaluating "== 'microshift-okd-rpm'" works as intended; locate the
conditional expression (the if: inputs.rpm-builder == 'microshift-okd-rpm' line)
and replace rpm-builder with rpm-image.


- name: Build MicroShift RPMs
shell: bash
if: inputs.rpm-builder == 'microshift-okd-rpm'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Same typo: rpm-builder should be rpm-image.

Proposed fix
-      if: inputs.rpm-builder == 'microshift-okd-rpm'
+      if: inputs.rpm-image == 'microshift-okd-rpm'
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if: inputs.rpm-builder == 'microshift-okd-rpm'
if: inputs.rpm-image == 'microshift-okd-rpm'
🤖 Prompt for AI Agents
In @.github/actions/build/action.yaml at line 52, The conditional uses the wrong
input name: change the occurrence of "if: inputs.rpm-builder ==
'microshift-okd-rpm'" to use the correct input key "rpm-image" (e.g., "if:
inputs.rpm-image == 'microshift-okd-rpm'") so the action reads the intended
input; update any other references of "rpm-builder" in this file to "rpm-image"
to keep names consistent.

Comment on lines +11 to +18
# hadolint ignore=DL4006
RUN \
echo "# Download the RPMs from COPR" && \
copr download-build --rpms --chroot "epel-9-$(uname -m)" --dest /tmp/rpms ${COPR_BUILD_ID} && \
\
echo "# Extract the MicroShift source code into /home/microshift/microshift" && \
mkdir -p /home/microshift/microshift && \
cd /tmp/rpms/"epel-9-$(uname -m)"/ && \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Fix hadolint DL3003 violation causing pipeline failure.

The cd command on line 18 triggers DL3003. Add DL3003 to the ignore list or refactor to avoid cd.

Proposed fix (add to ignore list)
-# hadolint ignore=DL4006
+# hadolint ignore=DL3003,DL4006
 RUN \
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# hadolint ignore=DL4006
RUN \
echo "# Download the RPMs from COPR" && \
copr download-build --rpms --chroot "epel-9-$(uname -m)" --dest /tmp/rpms ${COPR_BUILD_ID} && \
\
echo "# Extract the MicroShift source code into /home/microshift/microshift" && \
mkdir -p /home/microshift/microshift && \
cd /tmp/rpms/"epel-9-$(uname -m)"/ && \
# hadolint ignore=DL3003,DL4006
RUN \
echo "# Download the RPMs from COPR" && \
copr download-build --rpms --chroot "epel-9-$(uname -m)" --dest /tmp/rpms ${COPR_BUILD_ID} && \
\
echo "# Extract the MicroShift source code into /home/microshift/microshift" && \
mkdir -p /home/microshift/microshift && \
cd /tmp/rpms/"epel-9-$(uname -m)"/ && \
🧰 Tools
🪛 GitHub Actions: linters

[error] 12-12: Hadolint failed on containerfile with DL3003: Use WORKDIR to switch to a directory. (This is reported as a warning by Hadolint, but the step exited with an error in the CI pipeline.)

🤖 Prompt for AI Agents
In `@packaging/rpms-copr.Containerfile` around lines 11 - 18, The RUN block
contains a shell cd (cd /tmp/rpms/"epel-9-$(uname -m)"/) which triggers hadolint
DL3003; either add DL3003 to the hadolint ignore list on that RUN (augment the
existing "# hadolint ignore=DL4006" to include DL3003) or refactor the RUN to
avoid cd (use absolute paths or a subshell/pushd/popd pattern) so the DL3003
violation is removed; update the RUN block containing the cd command
accordingly.

Comment on lines +35 to +50
.PHONY: rpm-copr
rpm-copr:
@echo "Building MicroShift RPM image using COPR"
sudo podman build \
--tag "${COPR_BUILDER_IMAGE}" \
--build-arg COPR_BUILD_ID="${COPR_BUILD_ID}" \
--file packaging/rpms-copr.Containerfile .

@echo "Extracting the MicroShift RPMs"
outdir="$${RPM_OUTDIR:-$$(mktemp -d /tmp/microshift-rpms-XXXXXX)}" && \
mntdir="$$(sudo podman image mount "${COPR_BUILDER_IMAGE}")" && \
sudo cp -r "$${mntdir}/home/microshift/microshift/_output/rpmbuild/RPMS/." "$${outdir}" && \
sudo podman image umount "${COPR_BUILDER_IMAGE}" && \
echo "" && \
echo "Build completed successfully" && \
echo "RPMs are available in '$${outdir}'"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Missing cleanup trap on error in rpm-copr.

If the cp command fails, the image remains mounted. Use a trap like the existing rpm target does.

Suggested fix
 	`@echo` "Extracting the MicroShift RPMs"
 	outdir="$${RPM_OUTDIR:-$$(mktemp -d /tmp/microshift-rpms-XXXXXX)}" && \
 	mntdir="$$(sudo podman image mount "${COPR_BUILDER_IMAGE}")" && \
+	trap "sudo podman image umount '${COPR_BUILDER_IMAGE}' >/dev/null" EXIT && \
 	sudo cp -r "$${mntdir}/home/microshift/microshift/_output/rpmbuild/RPMS/." "$${outdir}" && \
-	sudo podman image umount "${COPR_BUILDER_IMAGE}" && \
 	echo "" && \
 	echo "Build completed successfully" && \
 	echo "RPMs are available in '$${outdir}'"

Comment on lines +1 to +4
#!/usr/bin/env bash
set -euo pipefail

out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Validate COPR_REPO_NAME is set.

The script uses COPR_REPO_NAME but doesn't validate it's non-empty, which would cause a cryptic copr-cli error.

Proposed fix
 #!/usr/bin/env bash
 set -euo pipefail

+if [[ -z "${COPR_REPO_NAME:-}" ]]; then
+    echo "ERROR: COPR_REPO_NAME environment variable is required"
+    exit 1
+fi
+
 out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
#!/usr/bin/env bash
set -euo pipefail
out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
#!/usr/bin/env bash
set -euo pipefail
if [[ -z "${COPR_REPO_NAME:-}" ]]; then
echo "ERROR: COPR_REPO_NAME environment variable is required"
exit 1
fi
out="$(copr-cli --config /run/secrets/copr-cfg build --nowait "${COPR_REPO_NAME}" /srpms/microshift*.src.rpm)"
🤖 Prompt for AI Agents
In `@src/copr/create-build.sh` around lines 1 - 4, The script
src/copr/create-build.sh uses the COPR_REPO_NAME variable without verifying it
is non-empty; add an explicit validation at the top of the script (before
calling copr-cli) that checks COPR_REPO_NAME is set and not empty, prints a
clear error message to stderr (including the variable name) and exits non-zero
if the check fails, then proceed to run the existing copr-cli build command;
reference COPR_REPO_NAME and the copr-cli invocation when adding the guard.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant