Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-54755

Disable "Require branches to be up to date before merging" on Evergreen repo

    • Icon: Task Task
    • Resolution: Fixed
    • Icon: Minor Minor
    • evergreen
    • None
    • Evergreen - Milestone 2

      Problem statement

      We enabled some time ago the fact that reviews were required.
      In the go, we also enabled the fact that the branch *must* be up-to-date.

      This makes sense in general, but is mostly a waste of time in our time, given we use the merge strategy, i.e. Jenkins will first merge the PR against master, then build it (showing up as pr-merge on the PR status check).

      I assume this GitHub settings makes sense for other CI systems or when Jenkins is only configured to build the so-called pr-head.

      Expected

      We should only require reviews.
      We can allow not being up to date with master branch given we build pr-merge.

      to clarify, we need to uncheck the bolded line:

          [JENKINS-54755] Disable "Require branches to be up to date before merging" on Evergreen repo

          Baptiste Mathus created issue -
          Baptiste Mathus made changes -
          Sprint New: Evergreen - Milestone 2 [ 516 ]

          I will proceed about this later today or tomorrow I think. Cc rtyler in case you think this should be preserved for a good reason and you possibly actually configured it this way on purpose.

          Thanks

          Baptiste Mathus added a comment - I will proceed about this later today or tomorrow I think. Cc rtyler in case you think this should be preserved for a good reason and you possibly actually configured it this way on purpose. Thanks
          Baptiste Mathus made changes -
          Attachment New: to be unchecked.png [ 45242 ]
          Baptiste Mathus made changes -
          Description Original: h3. Problem statement

          We enabled some time ago the fact that reviews were required.
          In the go, we also enabled the fact that the branch **must** be up-to-date.

          This makes sense in general, but is mostly a waste of time in our time, given we use the merge strategy, i.e. Jenkins will first merge the PR against master, then build it (showing up as {{pr-merge}} on the PR status check).

          I assume this GitHub settings makes sense for other CI systems or when Jenkins is only configured to build the so-called {{pr-head}}.

          h3. Expected

          We should only require reviews.
          We can allow not being up to date with master branch given we build {{pr-merge}}.
          New: h3. Problem statement

          We enabled some time ago the fact that reviews were required.
          In the go, we also enabled the fact that the branch **must** be up-to-date.

          This makes sense in general, but is mostly a waste of time in our time, given we use the merge strategy, i.e. Jenkins will first merge the PR against master, then build it (showing up as {{pr-merge}} on the PR status check).

          I assume this GitHub settings makes sense for other CI systems or when Jenkins is only configured to build the so-called {{pr-head}}.

          h3. Expected

          We should only require reviews.
          We can allow not being up to date with master branch given we build {{pr-merge}}.

          to clarify, we need to uncheck the bolded line:
           !to be unchecked.png!
          Baptiste Mathus made changes -
          Status Original: Open [ 1 ] New: In Progress [ 3 ]
          Baptiste Mathus made changes -
          Attachment New: updated new configuration.png [ 45246 ]

          Done.

          New config:

          Baptiste Mathus added a comment - Done. New config:
          Baptiste Mathus made changes -
          Status Original: In Progress [ 3 ] New: In Review [ 10005 ]
          Baptiste Mathus made changes -
          Resolution New: Fixed [ 1 ]
          Status Original: In Review [ 10005 ] New: Resolved [ 5 ]

            batmat Baptiste Mathus
            batmat Baptiste Mathus
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

              Created:
              Updated:
              Resolved: