~emmabrostrom/ols-jenkaas:pre-merge-bot-comment

Last commit made on 2024-04-15
Get this branch:
git clone -b pre-merge-bot-comment https://git.launchpad.net/~emmabrostrom/ols-jenkaas
Only Emma Brostrom can upload to this branch. If you are Emma Brostrom please log in for upload directions.

Branch merges

Branch information

Name:
pre-merge-bot-comment
Repository:
lp:~emmabrostrom/ols-jenkaas

Recent commits

1e3777c... by Emma Brostrom

Re-introduce pre-merge refactor to exclude certain bot comments

5fc326d... by Emma Brostrom

Revert "Refactor get_most_recent_commit_Seen_by_bot to exclude other bot commetns"

This reverts commit 3f423cfb3f6b55e39d11d61557af7380a2a6cda3.

3f423cf... by Emma Brostrom

Refactor get_most_recent_commit_Seen_by_bot to exclude other bot commetns

c6a5014... by Maximiliano Bertacchini

Fix small command typo

Merged from https://code.launchpad.net/~emmabrostrom/ols-jenkaas/+git/ols-jenkaas/+merge/463767

eb0c452... by Emma Brostrom

Fix small command typo

933c948... by Guillermo Gonzalez

Add temporary merge before pre-merge CI testing

This improves accuracy by testing on actual final product
of the merge proposal, and will catch things like merge
conflicts.

Solves: https://warthogs.atlassian.net/browse/SN-2722

f6949f8... by Emma Brostrom

Linting

aab394f... by Emma Brostrom

Add a temporary merge before pre-merge CI testing

d57b13d... by Maximiliano Bertacchini

Fix `slave/update` script to use `git reset --hard origin/main` when updating the jenkaas and secrets checkouts

Merged from https://code.launchpad.net/~verterok/ols-jenkaas/+git/ols-jenkaas/+merge/463668

c4fddbb... by Maximiliano Bertacchini

Fix bug that was causing land-approved-git-proposal to fail

Merged from https://code.launchpad.net/~lofidevops/ols-jenkaas/+git/ols-jenkaas/+merge/463672