Approved Merge Requests (EE-only) is not persisted

[DieBauer]

Context

• Gitlab plugin version: 1.5.3
• Gitlab version: 10.3.5
• Jenkins version: 2.89.3
• Job type: Freestyle

Problem description

The plugin doesn't respect a flag for
<f:entry title="Approved Merge Requests (EE-only)" field="triggerOnApprovedMergeRequest">

When toggling this setting and applying the change on refresh of the job, the toggle is activated again.

It should persist the toggle.

There are no log statements in the Jenkins log.

[shark-horse]

I too cannot disable "Approved Merge Requests (EE-only)".

What does that setting do? Link to documentation saying what it does would be welcome.

I was trying to disable it because of a hunch that it means to trigger a build upon an approval. Basically I was trying to troubleshoot #633 .

Context
Gitlab plugin version: 1.5.3
Gitlab version: 10.4.0-ee
Jenkins version: 2.89.3
Job type: Maven

[prawen]

Hello,

I'm facing the same issue. Will there be any fix for this?

[eddie3716]

I too am experiencing the same problem. I found the discussion #633 and followed it until I found this new open issue.

Gitlab plugin version: 1.5.3
Gitlab version: 10.2.2-ee
Jenkins version: 2.89.3

[eddie3716]

@jakub-bochenski @Argelbargel the change made from #664 is the cause of this bug.

[jakub-bochenski]

Sorry, I cannot reproduce that. Here is a screenshot of me changing this value.

A bug that I can reproduce is connected to the Web form used to configure the job.
Because the trigger object lacks a getter for the value it will always display true regardless of the actual setting.
I recommend checking the config xml to be sure.

[shark-horse]

@jakub-bochenski Are you saying you can change the value somehow, but not through the Web UI? If so, how?

Are you using a plugin to keep track of project configuration history? How do you get to that view in the screenshot you shared?

I'm just editing through the UI currently:

We're using a plugin to backup our configuration via a git repo. I may be able to submit a change via that, but I think additional steps are required for the change to take effect. Really, I don't know how to control the configuration via direct file manipulation--IME there's more to it than meets the eye, maybe because of the aforementioned plugin.

[shark-horse]

Looking through history, I do see a change to the config.xml:

       <triggerOnAcceptedMergeRequest>false</triggerOnAcceptedMergeRequest>
       <triggerOnClosedMergeRequest>false</triggerOnClosedMergeRequest>
-      <triggerOnApprovedMergeRequest>true</triggerOnApprovedMergeRequest>
+      <triggerOnApprovedMergeRequest>false</triggerOnApprovedMergeRequest>
       <triggerOpenMergeRequestOnPush>source</triggerOpenMergeRequestOnPush>
       <triggerOnNoteRequest>true</triggerOnNoteRequest>

but Jenkins is still building upon Approval, which is incorrect for our workflow.

[jakub-bochenski]

but Jenkins is still building upon Approval, which is incorrect for our workflow.

I haven't checked that, but it would be a separate issue from the incorrect display in Web UI.

We use job-dsl plugin to manage the job configuration, that's why I haven't noticed the UI issue before.

The change above was done via Web UI though, the screenshot comes from the JobConfigHistory plugin.

[williamzhao87]

I am also seeing this issue. Has anyone found any workaround?

[jakub-bochenski]

@williamzhao87 there is a PR fixing it linked above :(

[lambourn]

Any update on this issue? I also experience this - as soon as a MR gets approved, the pipeline gets kicked of again. In our workflow we run only want to run builds when pushes are done to the MR but not on approval.

[shark-horse]

FWIW, as a workaround, I configured the Gitlab plugin (in the Jenkins job) to not build on the creation of an MR, which means we have to wait until approval for a build. (We have configured Gitlab to only allow merging with at least 1 approval + a successful build, i.e. a failed or pending build will block merging.)

[dskrvk]

@shark-horse I'm curious how you configured Gitlab to block on Jenkins builds - is it through Gitlab CI? Did you also have to configure CI runners?

[shark-horse]

@dskrvk What I was talking about in my previous comment was a config change in a Jenkins job, not a change in Gitlab. Specifically, I configured the Gitlab plugin in Jenkins to not build on creation of an MR:

Notice that Opened Merge Request Events is unchecked (because Approved Merge Requests (EE-only) is always checked.)

In Gitlab, I am using a Webhook that triggers on Merge Request Events (gitlabUrl/settings/integrations). I know it is sending information to Jenkins every time the MR is opened because, prior to disabling builds on opened MR's, Jenkins would build on opened MR's. Jenkins is simply ignoring that per the configuration in the Jenkins job.

FWIW:

• I opted for Webhooks instead of the Jenkins CI service because we need certain flexibility not provided by the service.
• Beyond the scope of this issue, I configured the job in Jenkins to build if someone says "Jenkins retry" in a comment, and I configured Gitlab to notify Jenkins upon a "Note event" which seems to correspond to comments in MR's.

[omehegan]

This was fixed/released in version 1.5.4 of the plugin, which should be available in the update center soon.

[MaffooBristol]

Thanks! Can confirm that this has been fixed once I upgraded to 1.5.5 👍