NO-JIRA: Adding a first claude slash command for syncing downstream with upstream

[matzew]

As per title.

Experimenting with claude, and adding a "slash command" for the downstream sync.

Not sure if that's a great win over something like this "script":

  # Create the sync-downstream branch and merge WITHOUT committing
  git fetch downstream
  git fetch upstream
  git checkout -b sync-downstream upstream/main
  git merge -s ours --no-commit downstream/main

  # Now, use `git checkout` to grab the specific files/folders
  git checkout downstream/main -- .ci-operator.yaml
  git checkout downstream/main -- .snyk
  git checkout downstream/main -- .tekton/
  git checkout downstream/main -- Dockerfile.ci
  git checkout downstream/main -- Dockerfile.ocp
  git checkout downstream/main -- Makefile-ocp.mk
  git checkout downstream/main -- OWNERS
  git checkout downstream/main -- mcp_config.toml
  git checkout downstream/main -- renovate.json

  # Update vendored dependencies
  go mod tidy
  go mod vendor
  git add vendor/

  # Commit EVERYTHING in ONE commit (including the merge)
  git commit -am "sync: merge upstream main with downstream config"

But Claude is being a good assistant

[openshift-ci-robot]

@matzew: This pull request explicitly references no jira issue.

In response to this:

As per title.

Experimenting with claude, and adding a "slash command" for the downstream sync.

Not sure if that's a great win over something like this "script":

 # Create the sync-downstream branch and merge WITHOUT committing
 git fetch downstream
 git fetch upstream
 git checkout -b sync-downstream upstream/main
 git merge -s ours --no-commit downstream/main

 # Now, use `git checkout` to grab the specific files/folders
 git checkout downstream/main -- .ci-operator.yaml
 git checkout downstream/main -- .snyk
 git checkout downstream/main -- .tekton/
 git checkout downstream/main -- Dockerfile.ci
 git checkout downstream/main -- Dockerfile.ocp
 git checkout downstream/main -- Makefile-ocp.mk
 git checkout downstream/main -- OWNERS
 git checkout downstream/main -- mcp_config.toml
 git checkout downstream/main -- renovate.json

 # Update vendored dependencies
 go mod tidy
 go mod vendor
 git add vendor/

 # Commit EVERYTHING in ONE commit (including the merge)
 git commit -am "sync: merge upstream main with downstream config"

But Claude is being a good assistant

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: matzew

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [matzew]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[matzew]

/assign @Cali0707

[matzew]

/hold

the outcome is a bit odd :)

[matzew]

/unhold

tweaked it to use detached HEAD, and it got the same diff, than my manual script

[openshift-ci]

@matzew: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[Cali0707]

Overall this looks fine as a claude command to me. Tbh I'm not 100% sure this is the best scenario to use a cluade command in, and that may be influencing the comment I left.

However, I also don't mind having a claude command so I'm happy if this goes in

[Cali0707]

Is it possible to move all of this into a script, and just tell claude to use that script/make target?

I feel like that could be more general - then claude users can do a sync with claude and non-claude users can do one manually if they want