Force registration

Author: ysok

scripts/lockfile-generators/helpers/hermeto-fetch-rpm.sh

@@ -78,6 +78,13 @@ CERT_DIR="${CERT_DIR:-${SUBSCRIPTION_CERT_DIR:-}}"
 ACTIVATION_KEY="${ACTIVATION_KEY:-${SUBSCRIPTION_ACTIVATION_KEY:-}}"
 ORG="${ORG:-${SUBSCRIPTION_ORG:-}}"
 
+# Auto-detect entitlement certs left by the GHA "Add subscriptions" step,
+# which writes PEM files to entitlement/ and configures mounts.conf.
+if [[ -z "$CERT_DIR" ]] && ls entitlement/*.pem &>/dev/null; then
+  echo "--- Auto-detected entitlement/ directory from GHA subscription step ---"
+  CERT_DIR="entitlement"
+fi
+
 # Build the hermeto JSON input — add SSL config when using RHEL subscription
 # so hermeto can authenticate to cdn.redhat.com for entitled content.
 HERMETO_JSON='{"type": "rpm"}'
@@ -118,7 +125,7 @@ elif [[ -n "$ACTIVATION_KEY" ]] && [[ -n "$ORG" ]]; then
     -e SM_ORG="$ORG" \
     -e SM_KEY="$ACTIVATION_KEY" \
     "$UBI9_IMAGE" \
-    sh -c 'subscription-manager register --org="$SM_ORG" --activationkey="$SM_KEY" >/dev/null && tar -cf - /etc/pki/entitlement/ /etc/rhsm/ca/' \
+    sh -c 'subscription-manager register --force --org="$SM_ORG" --activationkey="$SM_KEY" >/dev/null && tar -cf - /etc/pki/entitlement/ /etc/rhsm/ca/' \
     > "$CERT_TAR" 2>"$REG_LOG" || true
   "$_xtrace_was_set" && set -x
   if [[ -s "$CERT_TAR" ]]; then