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

OLMv1 bumper overrides changes downstream


    • Icon: Bug Bug
    • Resolution: Unresolved
    • Icon: Normal Normal
    • 4.16.0
    • 4.16
    • OLM
    • None
    • Moderate
    • No
    • Quality OLM Sprint 251, Rasputin OLM Sprint 252, Sassy OLM Sprint 253
    • 3
    • Rejected
    • False
    • Hide


    • Release Note Not Required
    • In Progress

      We merged this ART PR which bumps base images. And then bumper [reverted the changes here|https://github.com/openshift/operator-framework-operator-controller/pull/88/files].

      I still see the ART bump commit in main, but there is "Add OpenShift specific files" commit on top of it with older images. Actually now we have two "Add OpenShift specific files" commits in main:

      And every UPSTREAM: <carry>-prefixed commit seems to be duplicated on top of synced changes.

      Expected result:

      • Bumper doesn't override/revert UPSTREAM: <carry>-prefixed commit contributed directly into the downstream repos. Order of UPSTREAM: <carry>-prefixed commits should be respected.

            mradchuk@redhat.com Mikalai Radchuk
            mradchuk@redhat.com Mikalai Radchuk
            Jian Zhang Jian Zhang
            0 Vote for this issue
            6 Start watching this issue