Makefile: use grep -E instead of egrep

[gotmax23]

Running egrep on modern systems prints

egrep: warning: egrep is obsolescent; using grep -E

[oraNod]

Thanks @gotmax23 and @felixfontein

[patchback]

Backport to stable-2.15: 💔 cherry-picking failed — could not push

❌ Current GitHub App installation does not grant sufficient privileges for pushing to https://github.com/ansible/ansible-documentation.git. Lacking Contents: write or Workflows: write permissions are known to cause this.

the underlying command output was:

$ git --git-dir /tmp/ansible--ansible-documentation---stable-2.15---dik0l3rb---PR-103.git/.git --work-tree /tmp/ansible--ansible-documentation---stable-2.15---dik0l3rb---PR-103.git -c user.email=45432694+patchback[bot]@users.noreply.github.com -c user.name=patchback[bot] -c diff.algorithm=histogram push --force-with-lease origin HEAD

[RETURN CODE]: 1

[OUTPUT]:


[STDERR]:

Backporting merged PR #103 into devel

1. Ensure you have a local repo clone of your fork. Unless you cloned it
   from the upstream, this would be your origin remote.
2. Make sure you have an upstream repo added as a remote too. In these
   instructions you'll refer to it by the name upstream. If you don't
   have it, here's how you can add it:

   $ git remote add upstream https://github.com/ansible/ansible-documentation.git

3. Ensure you have the latest copy of upstream and prepare a branch
   that will hold the backported code:

   $ git fetch upstream
   $ git checkout -b patchback/backports/stable-2.15/5fe565bb950288324c454285f6140f5311c2b83c/pr-103 upstream/stable-2.15

4. Now, cherry-pick PR Makefile: use grep -E instead of egrep #103 contents into that branch:

   $ git cherry-pick -x 5fe565bb950288324c454285f6140f5311c2b83c

   If it'll yell at you with something like fatal: Commit 5fe565bb950288324c454285f6140f5311c2b83c is a merge but no -m option was given., add -m 1 as follows instead:

   $ git cherry-pick -m1 -x 5fe565bb950288324c454285f6140f5311c2b83c

5. At this point, you'll probably encounter some merge conflicts. You must
   resolve them in to preserve the patch from PR Makefile: use grep -E instead of egrep #103 as close to the
   original as possible.
6. Push this branch to your fork on GitHub:

   $ git push origin patchback/backports/stable-2.15/5fe565bb950288324c454285f6140f5311c2b83c/pr-103

7. Create a PR, ensure that the CI is green. If it's not — update it so that
   the tests and any other checks pass. This is it!
   Now relax and wait for the maintainers to process your pull request
   when they have some cycles to do reviews. Don't worry — they'll tell you if
   any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[patchback]

Backport to stable-2.14: 💔 cherry-picking failed — target branch does not exist

❌ Failed to fetch https://github.com/ansible/ansible-documentation.git

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[patchback]

Backport to stable-2.13: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.13/5fe565bb950288324c454285f6140f5311c2b83c/pr-103

Backported as #110

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[patchback]

Backport to stable-2.15: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.15/5fe565bb950288324c454285f6140f5311c2b83c/pr-103

Backported as #111

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[patchback]

Backport to stable-2.14: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.14/5fe565bb950288324c454285f6140f5311c2b83c/pr-103

Backported as #112

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[webknjaz]

Hey @felixfontein, I got a Sentry alert https://red-hat-ansibullbot.sentry.io/share/issue/801c1c6a9db04e9fb657f8ca011ce0aa/. It looks like it's related to #103 (comment). git push --force-with-lease is known to fail during simultaneous repo updates (something to do with server-side locks in Git — sanitizers/patchback-github-app#18) but I can't seem to correlate it with any repo updates around that time. Did you notice anything that could be related?

[webknjaz]

Found the log! Will need to google what that error: rev-list died of signal 9 is, but it's probably just bad network...

INFO:patchback.event_handlers:PR#103 got labeled with "backport-2.15". It needs to be backported to stable-2.15
--


INFO:patchback.event_handlers:PR#103 got labeled with "backport-2.15". It needs to be backported to stable-2.15
INFO:patchback.event_handlers:PR#103 merge commit: 5fe565bb950288324c454285f6140f5311c2b83c
INFO:patchback.github_reporter:Checks API is available
INFO:patchback.event_handlers:Created a temporary dir: `/tmp/ansible--ansible-documentation---stable-2.15---62dcydlm---PR-103.git`
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint: 
hint: 	git config --global init.defaultBranch <name>
hint: 
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint: 
hint: 	git branch -m <name>
Initialized empty Git repository in /tmp/ansible--ansible-documentation---stable-2.15---62dcydlm---PR-103.git/.git/
INFO:octomachinery.app.routing.webhooks_dispatcher:Got a valid X-GitHub-Event=pull_request with X-GitHub-Delivery=9120f040-21bb-41ee-8940-466b28d07b39 and X-Hub-Signature=sha1=d42f700102854d76308b62a3e9b9f4994a4947c3
INFO:aiohttp.access:10.131.10.1 [13/Jul/2023:20:26:38 +0000] "POST / HTTP/1.1" 200 30508 "-" "GitHub-Hookshot/bfdfc6c"
error: rev-list died of signal 9
error: https://github.com/ansible/ansible-documentation.git did not send all necessary objects

[felixfontein]

@webknjaz when Sandra added the backport labels yesterday the backporting procedure seemed to have started (the first comments were there), but then nothing seemed to happen for several minutes. I tried removing and re-adding one label, with the same result. Eventually two of the backports finished and one died with an error; I then removed and re-added that label and it also finished.

My guess is also (with that and from your log) that there was some network issues, and that resulted in a git command timing out, or being killed after running for too long.

[webknjaz]

Yeah.. Googling suggests that it might've been killed by OOM tho. So who knows.