Uploaded image for project: 'OpenShift Bugs'
  1. OpenShift Bugs
  2. OCPBUGS-5549

MicroShift's rebase step creates tight coupling with specific branch

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Done
    • Icon: Normal Normal
    • 4.12.0
    • 4.13
    • MicroShift
    • None
    • None
    • False
    • Hide

      None

      Show
      None

      This is a clone of issue OCPBUGS-5537. The following is the description of the original issue:

      Description of problem:

      In rebase commands ( https://github.com/openshift/release/blob/master/ci-operator/step-registry/openshift/microshift/rebase/openshift-microshift-rebase-commands.sh ) two scripts are called directly: rebase.sh and create_pr.py.
      
      However, soon I plan to deprecate create_pr.py with new rebase.py which will wrap rebase.sh and will be able to create/update PRs based on rebase.sh's exit code and handle more scenarios.
      In current rebase step form we would have to either:
      - introduce rebase.py also on release-4.12 which is planned, but I'd like to use main as a testing area first
      - add custom logic that would perform different steps if the branch was release-4.12 which already creates an exception
      
      Idea is to move contents of commands.sh to the microshift repository and have rebase job call only that file which will contain branch specific branch and the auto-rebase procedure (at least scripting part of it) will be contained to the microshift repo
      

      Version-Release number of selected component (if applicable):

      -
      

      How reproducible:

      -
      

      Steps to Reproduce:

      -
      

      Actual results:

      -
      

      Expected results:

      -
      

      Additional info:

      
      

              ggiguash@redhat.com Gregory Giguashvili
              openshift-crt-jira-prow OpenShift Prow Bot
              John George John George
              Votes:
              0 Vote for this issue
              Watchers:
              4 Start watching this issue

                Created:
                Updated:
                Resolved: