From d24455c87028649c4e3e43647bbdf0be691e1f19 Mon Sep 17 00:00:00 2001
From: Eric Fried <efried@redhat.com>
Date: Thu, 13 Aug 2026 16:36:08 -0500
Subject: [PATCH] openshift-mcp-server: Auto-ff `release-0.5` daily

Replaces #83135/#83296, putting the job in infra-periodics per protocol.

Assisted-By: cursor/grok-4.5
---
 ci-operator/jobs/infra-periodics.yaml | 46 +++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/ci-operator/jobs/infra-periodics.yaml b/ci-operator/jobs/infra-periodics.yaml
index 4a4ef8e8e13c9..3f3b93f20eae9 100644
--- a/ci-operator/jobs/infra-periodics.yaml
+++ b/ci-operator/jobs/infra-periodics.yaml
@@ -1612,6 +1612,52 @@ periodics:
     - name: token
       secret:
         secretName: github-credentials-openshift-merge-robot
+- agent: kubernetes
+  cluster: app.ci
+  cron: 0 6 * * *
+  decorate: true
+  labels:
+    ci.openshift.io/role: infra
+  name: periodic-openshift-mcp-server-fast-forward
+  spec:
+    containers:
+    - args:
+      - -c
+      - |
+        set -o errexit
+        set -o nounset
+        set -o pipefail
+        dnf install -y git
+        export HOME=/tmp
+        cd /tmp
+        # Avoid putting credentials in argv/env/logs
+        git_cmd() {
+          git -c credential.helper= -c credential.helper='!f() { echo username=openshift-merge-robot; printf password=; cat /etc/github/oauth; echo; }; f' "$@"
+        }
+        src=main
+        dst=release-0.5
+        repo_url=https://github.com/openshift/openshift-mcp-server.git
+        echo "Fast-forwarding ${src} -> ${dst} for openshift/openshift-mcp-server"
+        git_cmd clone -b "${dst}" "${repo_url}" repo
+        cd repo
+        git_cmd pull --ff-only origin "${src}"
+        git_cmd push
+      command:
+      - /bin/bash
+      image: quay-proxy.ci.openshift.org/openshift/ci:ocp_cli-jq_latest
+      imagePullPolicy: Always
+      name: ""
+      resources:
+        requests:
+          cpu: 100m
+      volumeMounts:
+      - mountPath: /etc/github
+        name: token
+        readOnly: true
+    volumes:
+    - name: token
+      secret:
+        secretName: github-credentials-openshift-merge-robot
 - agent: kubernetes
   annotations:
     ci.openshift.io/sop: https://github.com/openshift/release/blob/main/docs/dptp-triage-sop/infrastructure-jobs.md#periodic-openshift-release-private-org-sync