Experiment with marge-bot on gitlab-test
Closed, ResolvedPublic
Actions

Description

marge-bot is "a merge-bot for GitLab that, beside other goodies, implements the Not Rocket Science Rule Of Software Engineering".

Marge-bot offers the simplest of workflows: when a merge-request is ready, just assign it to its user, and let her do all the rebase-wait-retry for you. If anything goes wrong (merge conflicts, tests that fail, etc.) she'll leave a message on the merge-request, so you'll get notified. Marge-bot can handle an adversarial environment where some developers prefer to merge their own changes, so the barrier for adoption is really low.

This has been mentioned by other users of GitLab. We should see how / if it works for us.

Event Timeline

brennen created this task.Sep 10 2020, 9:39 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptSep 10 2020, 9:39 PM

brennen moved this task from Backlog to Next on the User-brennen board.Sep 14 2020, 8:13 PM

@thcipriani did some poking at this the other morning.

First impressions: This could use more experimentation, but it has some limitations (not being able to deal with auto-squash merge requests, for example) and I'm not sure how useful it is overall for our purposes.

Setup entailed some fiddling, but not generally too bad an undertaking:

A user: https://gitlab-test.wmcloud.org/marge-bot

Run script:

/home/thcipriani/marge-bot/run.sh

#!/usr/bin/env bash
printf '[INFO] Starting marge bot...'
sudo docker run --restart=on-failure \
  -v "$(pwd)":/configuration \
  smarkets/marge-bot:0.9.2 \
  --config-file=/configuration/marge-bot-config.yaml
printf 'DONE!\n'

Config with an SSH private key and an auth token:

/home/thcipriani/marge-bot/marge-bot-config.yaml

add-part-of: true
add-reviewers: true
add-tested: true
impersonate-approvers: true
gitlab-url: "https://gitlab-test.wmcloud.org"
auth-token: "REDACTED"
ssh-key: |
    REDACTED
    -----END OPENSSH PRIVATE KEY-----

A systemd unit:

/home/thcipriani/.config/systemd/user/marge-bot.service

[Unit]
Description = Marge bot
After = network.target

[Service]
Type = simple
WorkingDirectory = /home/thcipriani/marge-bot
StandardOutput=append:/home/thcipriani/marge-bot/debug.log
StandardError=append:/home/thcipriani/marge-bot/debug.log
ExecStart = /home/thcipriani/marge-bot/run.sh

brennen moved this task from Next to Doing on the User-brennen board.Sep 29 2020, 8:29 PM

brennen moved this task from Backlog to In Progress on the GitLab-Test board.

brennen moved this task from INBOX to New Work on the Release-Engineering-Team-TODO (2020-07-01 to 2020-09-30 (Q1)) board.

thcipriani edited projects, added Release-Engineering-Team-TODO (2020-10-01 to 2020-12-31 (Q2)); removed Release-Engineering-Team-TODO (2020-07-01 to 2020-09-30 (Q1)).Oct 21 2020, 1:07 AM

brennen added a project: GitLab.Oct 26 2020, 8:48 PM

brennen moved this task from Doing to Next on the User-brennen board.Nov 4 2020, 5:47 PM

Deployed marge bot, shows promise, but there is work to be done.

debt moved this task from Inbox to Completed on the GitLab board.Feb 26 2021, 5:28 PM

Experiment with marge-bot on gitlab-testClosed, ResolvedPublicActions

Description

Event Timeline

Experiment with marge-bot on gitlab-test
Closed, ResolvedPublic
Actions