From e3e9847a23daffd0b730cc8b52b79316f804e583 Mon Sep 17 00:00:00 2001 From: Eric Fried Date: Tue, 11 Aug 2026 17:27:12 -0500 Subject: [PATCH] openshift-mcp-server: pin auto-ff job to app.ci ...so it can find the credential secret --- .../openshift-openshift-mcp-server-main.yaml | 1 + .../openshift-openshift-mcp-server-main-periodics.yaml | 3 ++- .../openshift-mcp-server-fastforward-commands.sh | 6 ++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-operator/config/openshift/openshift-mcp-server/openshift-openshift-mcp-server-main.yaml b/ci-operator/config/openshift/openshift-mcp-server/openshift-openshift-mcp-server-main.yaml index 1addc2724cbee..15b24b01f22f3 100644 --- a/ci-operator/config/openshift/openshift-mcp-server/openshift-openshift-mcp-server-main.yaml +++ b/ci-operator/config/openshift/openshift-mcp-server/openshift-openshift-mcp-server-main.yaml @@ -67,6 +67,7 @@ tests: - chain: openshift-mcp-server-mcpchecker-eval-vertex workflow: ipi-aws - as: fast-forward-latest-release + cluster: app.ci cron: 0 6 * * * steps: env: diff --git a/ci-operator/jobs/openshift/openshift-mcp-server/openshift-openshift-mcp-server-main-periodics.yaml b/ci-operator/jobs/openshift/openshift-mcp-server/openshift-openshift-mcp-server-main-periodics.yaml index 89cee6efc5017..f578d4756bfaa 100644 --- a/ci-operator/jobs/openshift/openshift-mcp-server/openshift-openshift-mcp-server-main-periodics.yaml +++ b/ci-operator/jobs/openshift/openshift-mcp-server/openshift-openshift-mcp-server-main-periodics.yaml @@ -1,6 +1,6 @@ periodics: - agent: kubernetes - cluster: build01 + cluster: app.ci cron: 0 6 * * * decorate: true decoration_config: @@ -15,6 +15,7 @@ periodics: - .ci-operator.yaml - Dockerfile.ci labels: + ci-operator.openshift.io/cluster: app.ci ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-openshift-mcp-server-main-fast-forward-latest-release diff --git a/ci-operator/step-registry/openshift/mcp-server/fastforward/openshift-mcp-server-fastforward-commands.sh b/ci-operator/step-registry/openshift/mcp-server/fastforward/openshift-mcp-server-fastforward-commands.sh index 6cd87794e2979..45938910b2ae9 100755 --- a/ci-operator/step-registry/openshift/mcp-server/fastforward/openshift-mcp-server-fastforward-commands.sh +++ b/ci-operator/step-registry/openshift/mcp-server/fastforward/openshift-mcp-server-fastforward-commands.sh @@ -21,16 +21,14 @@ git_wrapper() { } log "INFO Fast-forward settings" -log " REPO_OWNER = $REPO_OWNER" -log " REPO_NAME = $REPO_NAME" log " SOURCE_BRANCH = $SOURCE_BRANCH" log " DESTINATION_BRANCH = $DESTINATION_BRANCH" -repo_url="https://github.com/${REPO_OWNER}/${REPO_NAME}.git" +repo_url="https://github.com/openshift/openshift-mcp-server.git" log "INFO Cloning $DESTINATION_BRANCH" git_wrapper clone -b "$DESTINATION_BRANCH" "$repo_url" -cd "$REPO_NAME" +cd "openshift-mcp-server" log "INFO Pulling $SOURCE_BRANCH into $DESTINATION_BRANCH (ff-only)" git_wrapper pull --ff-only origin "$SOURCE_BRANCH"