Uploaded image for project: 'OpenShift Application Platform Engineering'
  1. OpenShift Application Platform Engineering
  2. OAPE-150

[ansible-operator] Automate rebase process

XMLWordPrintable

    • Icon: Epic Epic
    • Resolution: Done
    • Icon: Normal Normal
    • None
    • None
    • Operator SDK
    • None
    • [ansible-operator] Automate rebase process
    • Quality / Stability / Reliability
    • 0% To Do, 0% In Progress, 100% Done
    • False
    • Hide

      None

      Show
      None
    • False
    • Not Selected
    • S
    • None
    • None

      The following processes should be automated as part of this epic:

      • Automate the rebase process by creating a shell script. The script should take care of the following:
        • Should take input regarding which upstream release to rebase to
        • Should take input regarding which downstream branch to add the rebase to
        • Should take care of any merge conflicts and prefer upstream changes over downstream ones. Print the details of the merge conflicts as well.
        • Add a drop commit after the rebase for go mod vendor.
        • Add a carry commit for regenerate downstream specific release artifacts (like requirements.txt, requirements-build.txt, requirements-pre-build.txt). If there's some error encountered then skip adding the commit and print the error encountered.
        • The existing script in ocp-release-operator-sdk repo can be used as an example (https://github.com/openshift/ocp-release-operator-sdk/blob/cafdde9a28155e11f40fe39012a4526c7c2f5688/UPSTREAM-MERGE.sh).
      • Add CI job for checking if the downstream requirements files are consistent with the Pipfile and Pipfile.lock files. Following steps should be accomplished as part of this automation:
        • The job should try to re-generate the downstream requirements files and then check the diff with current files. If the current files match with the expected files then the job should pass, otherwise it should fail.
      • Add CI job for checking if the downstream ansible collections directory is consistent with the requirements.yml file in the testdata directory. Following steps should be accomplished as part of this automation:
        • The job should try to re-generate the downstream ansible collections directory and then check the diff with current files. If the current files match with the expected files then the job should pass, otherwise it should fail.

              rh-ee-arsen Arkadeep Sen (Aurko)
              rh-ee-arsen Arkadeep Sen (Aurko)
              None
              None
              None
              None
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: