Add optional Pulp container registry upload to ceph-dev-pipeline.

Mirror dev container images from Quay to Pulp when PULP_REGISTRY_UPLOAD
is enabled

diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile
index 5265f37d4e2758fd96e3aff88d298f9a9b712cbf..af8076f6495785711955a0690592eb961641089a 100644 (file)
--- a/ceph-dev-pipeline/build/Jenkinsfile
+++ b/ceph-dev-pipeline/build/Jenkinsfile
@@ -643,11 +643,38 @@ pipeline {
                   export DISTRO=${os.name}
                   export RELEASE=${os.version}
                   export cephver=${cephver}
+                  if [ "\$PULP_REGISTRY_UPLOAD" == "true" ]; then
+                    export REMOVE_LOCAL_IMAGES=false
+                  fi
                   ./scripts/build_container
                 """
               }
             }
           }
+          stage("registry upload") {
+            when {
+              allOf {
+                expression { env.CI_CONTAINER == 'true' && container_distros.contains(env.DIST) }
+                expression { env.PULP_REGISTRY_UPLOAD == 'true' }
+              }
+            }
+            steps {
+              script {
+                withCredentials([
+                  usernamePassword(
+                    credentialsId: 'pulp-auth',
+                    usernameVariable: 'PULP_USERNAME',
+                    passwordVariable: 'PULP_PASSWORD'
+                  )
+                ]) {
+                  sh """#!/bin/bash
+                    set -ex
+                    ./scripts/pulp_container_push.sh
+                  """
+                }
+              }
+            }
+          }
         }
         post {
           success {

diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
index 0bd6ac546fefeec8109027e66a046c8b1c8c7964..c5a4d76fa3a163249060c2f9d379074265b95775 100644 (file)
--- a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
+++ b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
@@ -69,6 +69,11 @@
           description: "Whether to upload packages to Pulp"
           default: false
 
+      - bool:
+          name: PULP_REGISTRY_UPLOAD
+          description: "Whether to upload dev container images to the Pulp container registry"
+          default: false
+
       - choice:
           name: FLAVOR
           choices:

diff --git a/scripts/pulp_container_push.sh b/scripts/pulp_container_push.sh
new file mode 100755 (executable)
index 0000000..c564ea7
--- /dev/null
+++ b/scripts/pulp_container_push.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Push a locally built Ceph dev container image to the Pulp container registry.
+#
+# Intended to run after scripts/build_container (container/build.sh) when
+# REMOVE_LOCAL_IMAGES=false so the Quay-tagged image is still on the builder.
+#
+# Required environment variables:
+#   WORKSPACE                  - Jenkins workspace root
+#   SHA1                       - Git commit SHA for this build
+#   BRANCH                     - Ceph branch name
+#   ARCH                       - Build architecture (x86_64 or arm64)
+#   FLAVOR                     - Build flavor (default or debug)
+#   CONTAINER_REPO_HOSTNAME    - Source registry host (e.g. quay.ceph.io)
+#   CONTAINER_REPO_ORGANIZATION - Source registry org (e.g. ceph-ci)
+#   PULP_USERNAME              - Pulp registry username
+#   PULP_PASSWORD              - Pulp registry password
+
+set -ex
+
+: "${SHA1:?SHA1 is required}"
+: "${BRANCH:?BRANCH is required}"
+: "${ARCH:?ARCH is required}"
+: "${FLAVOR:?FLAVOR is required}"
+: "${CONTAINER_REPO_HOSTNAME:?CONTAINER_REPO_HOSTNAME is required}"
+: "${CONTAINER_REPO_ORGANIZATION:?CONTAINER_REPO_ORGANIZATION is required}"
+: "${PULP_USERNAME:?PULP_USERNAME is required}"
+: "${PULP_PASSWORD:?PULP_PASSWORD is required}"
+
+PULP_SERVER_URL="${PULP_SERVER_URL:-https://pulp.front.sepia.ceph.com}"
+PULP_REGISTRY_BASE_PATH="${PULP_REGISTRY_BASE_PATH:-ceph-ci}"
+PULP_PROJECT="${PULP_PROJECT:-ceph}"
+PULP_REGISTRY_TLS_VERIFY="${PULP_REGISTRY_TLS_VERIFY:-true}"
+
+# Strip scheme from a registry URL for podman image references.
+registry_host_from_url() {
+    local url="${1%/}"
+    url="${url#https://}"
+    url="${url#http://}"
+    printf '%s\n' "$url"
+}
+
+# Find the local dev container image produced by container/build.sh.
+# build.sh tags quay.ceph.io/ceph-ci/ceph with SHA1 (and optional suffixes).
+find_local_container_image() {
+    local repo_path="${CONTAINER_REPO_HOSTNAME}/${CONTAINER_REPO_ORGANIZATION}/ceph"
+    local image
+
+    image="$(
+        podman images --format '{{.Repository}}:{{.Tag}}' \
+            | grep "^${repo_path}:" \
+            | grep "${SHA1}" \
+            | head -1 \
+            || true
+    )"
+    if [ -n "$image" ]; then
+        printf '%s\n' "$image"
+        return 0
+    fi
+
+    echo "ERROR: No local container image found for ${repo_path}:*${SHA1}*" >&2
+    echo "Ensure REMOVE_LOCAL_IMAGES=false when running build_container" >&2
+    podman images --format '{{.Repository}}:{{.Tag}}' \
+        | grep "${CONTAINER_REPO_ORGANIZATION}/ceph" >&2 || true
+    return 1
+}
+
+SOURCE_IMAGE="$(find_local_container_image)"
+echo "Source image: ${SOURCE_IMAGE}" >&2
+
+PULP_REGISTRY_HOST="$(registry_host_from_url "$PULP_SERVER_URL")"
+IMAGE_ARCH="$(podman inspect --format '{{.Architecture}}' "$SOURCE_IMAGE")"
+IMAGE_TAG="${SHA1}-${IMAGE_ARCH}"
+DEST_IMAGE="${PULP_REGISTRY_HOST}/${PULP_REGISTRY_BASE_PATH}/${PULP_PROJECT}:${IMAGE_TAG}"
+
+echo "Logging in to ${PULP_SERVER_URL}" >&2
+podman login --tls-verify="${PULP_REGISTRY_TLS_VERIFY}" \
+    -u "${PULP_USERNAME}" -p "${PULP_PASSWORD}" "${PULP_SERVER_URL}"
+
+echo "Tagging ${SOURCE_IMAGE} -> ${DEST_IMAGE}" >&2
+podman tag "${SOURCE_IMAGE}" "${DEST_IMAGE}"
+
+echo "Pushing ${DEST_IMAGE}" >&2
+podman push --tls-verify="${PULP_REGISTRY_TLS_VERIFY}" "${DEST_IMAGE}"
+
+echo "Pulp container push completed: ${DEST_IMAGE} (branch=${BRANCH}, flavor=${FLAVOR}, arch=${ARCH})" >&2