1225836 - remove patches to bmo when deploying during test

Status: RESOLVED FIXED

(MozReview Graveyard :: General, defect)

Description

[:glob ✱]

patching bmo while deploying is fragile.

we have:

apache24.patch:
- this patch doesn't appear to be required - apache2.4 works find with "deny from all"

bmodata.patch:
- will be fixed by bug 1225833

elasticsearch.patch:
- will be fixed by bug 1225830

Comment 1

[:glob ✱]

Attachment: MozReview Request: testing: stop patching bmo when deploying to test (bug 1225836) r?gps

testing: stop patching bmo when deploying to test (bug 1225836) r?gps

Remove the last patch and the supporting patching code.  Also fixes pyflakes
and pep8 issues.

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8694039 [details]
MozReview Request: testing: stop patching bmo when deploying to test (bug 1225836) r?gps

https://reviewboard.mozilla.org/r/26651/#review24159

Nice work removing hacks.

::: testing/docker/builder-bmoweb/entrypoint.py:227
(Diff revision 1)
> -try:
> +if os.path.exists('/var/run/apache2/apache2.pid'):
>      os.unlink('/var/run/apache2/apache2.pid')

This is an anti-pattern since it requires multiple system calls and is prone to race conditions. Both aren't an issue here so I'm not going to block on it.

Comment 3

[:glob ✱]

https://reviewboard.mozilla.org/r/26651/#review24159

> This is an anti-pattern since it requires multiple system calls and is prone to race conditions. Both aren't an issue here so I'm not going to block on it.

my bad - i thought this script was python2.  i'll revert this change.

Comment 4

[:glob ✱]

(holding off on committing due to autoland-only commit freeze)

Comment 5

[:glob ✱]

https://hg.mozilla.org/hgcustom/version-control-tools/rev/127967697980