tripleo-build-containers-rhel-8-master errors out when applying rhel8 kolla patches

[Damien Ciabrini]

It seems that currently RDO CI fails on job tripleo-build-containers-rhel-8-master due to some RHEL8 kolla patch not being applied properly before starting to build containers.

From https://logserver.rdoproject.org/16/715016/1/openstack-check/tripleo-build-containers-rhel-8-master/28826fb/job-output.txt :

2020-03-25 18:04:30.530947 | TASK [build-containers : grab kolla patch rhel8]
2020-03-25 14:04:30.972165 | primary | + git config --global user.email <email address hidden>
2020-03-25 14:04:30.976205 | primary | + git config --global user.name Zuul
2020-03-25 14:04:30.977835 | primary | + git remote add upstream https://review.opendev.org/openstack/kolla
2020-03-25 14:04:30.980792 | primary | + git ls-remote https://review.opendev.org/openstack/kolla
2020-03-25 14:04:30.980876 | primary | + grep -E 'refs/changes/[[:digit:]]+/669471/'
2020-03-25 14:04:30.980985 | primary | + awk '{print $2}'
2020-03-25 14:04:30.981105 | primary | + sort -t / -k 5 -g -r
2020-03-25 14:04:30.981466 | primary | + head -1
2020-03-25 14:04:30.981483 | primary | + xargs '-I{}' git fetch https://review.opendev.org/openstack/kolla '{}'
2020-03-25 14:04:32.284528 | primary | From https://review.opendev.org/openstack/kolla
2020-03-25 14:04:32.284616 | primary | * branch refs/changes/71/669471/15 -> FETCH_HEAD
2020-03-25 14:04:32.293520 | primary | + git checkout -b rhel8 FETCH_HEAD
2020-03-25 14:04:32.641361 | primary | Switched to a new branch 'rhel8'
2020-03-25 14:04:32.641794 | primary | + git_rebase_branch=master
2020-03-25 14:04:32.642545 | primary | ++ git ls-remote https://review.opendev.org/openstack/kolla
2020-03-25 14:04:32.642633 | primary | ++ grep refs/changes/16/715016/1
2020-03-25 14:04:33.049447 | primary | ++ true
2020-03-25 14:04:33.049646 | primary | + found=
2020-03-25 14:04:33.049663 | primary | + echo
2020-03-25 14:04:33.049670 | primary |
2020-03-25 14:04:33.049698 | primary | + [[ -n '' ]]
2020-03-25 14:04:33.049710 | primary | + git pull --rebase upstream master
2020-03-25 14:04:33.450163 | primary | From https://review.opendev.org/openstack/kolla
2020-03-25 14:04:33.450199 | primary | * branch master -> FETCH_HEAD
2020-03-25 14:04:33.450625 | primary | * [new branch] master -> upstream/master
2020-03-25 14:04:33.522430 | primary | First, rewinding head to replay your work on top of it...
2020-03-25 14:04:33.612051 | primary | Applying: DNM: Add dnf modules for rhel8/py3 containers
2020-03-25 14:04:33.612078 | primary | Applying: DNM: Add rhel8 support for early CentOS8 testing
2020-03-25 14:04:33.627043 | primary | Using index info to reconstruct a base tree...
2020-03-25 14:04:33.627069 | primary | M docker/base/Dockerfile.j2
2020-03-25 14:04:33.627077 | primary | M kolla/common/config.py
2020-03-25 14:04:33.627105 | primary | Falling back to patching base and 3-way merge...
2020-03-25 14:04:33.627114 | primary | Auto-merging kolla/common/config.py
2020-03-25 14:04:33.627120 | primary | CONFLICT (content): Merge conflict in kolla/common/config.py
2020-03-25 14:04:33.627125 | primary | Auto-merging docker/base/Dockerfile.j2
2020-03-25 14:04:33.631885 | primary | error: Failed to merge in the changes.
2020-03-25 14:04:33.631911 | primary | Patch failed at 0002 DNM: Add rhel8 support for early CentOS8 testing
2020-03-25 14:04:33.631919 | primary | Use 'git am --show-current-patch' to see the failed patch
2020-03-25 14:04:33.631924 | primary |
2020-03-25 14:04:33.631929 | primary | Resolve all conflicts manually, mark them as resolved with
2020-03-25 14:04:33.631934 | primary | "git add/rm <conflicted_files>", then run "git rebase --continue".
2020-03-25 14:04:33.631938 | primary | You can instead skip this commit: run "git rebase --skip".
2020-03-25 14:04:33.631943 | primary | To abort and get back to the state before "git rebase", run "git rebase --abort".
2020-03-25 14:04:33.631951 | primary |
2020-03-25 18:04:44.170570 | primary | ERROR
2020-03-25 18:04:44.171549 | primary | {
2020-03-25 18:04:44.171834 | primary | "delta": "0:00:02.665318",
2020-03-25 18:04:44.172054 | primary | "end": "2020-03-25 14:04:33.634540",
2020-03-25 18:04:44.172331 | primary | "msg": "non-zero return code",
2020-03-25 18:04:44.172536 | primary | "rc": 128,
2020-03-25 18:04:44.172750 | primary | "start": "2020-03-25 14:04:30.969222"
2020-03-25 18:04:44.173037 | primary | }

[wes hayutin (weshayutin)]

https://review.rdoproject.org/r/#/c/26117/