Closed jcantrill closed 3 years ago
@jcantrill: This pull request references Bugzilla bug 1933978, which is valid.
No GitHub users were found matching the public email listed for the QA contact in Bugzilla (anli@redhat.com), skipping review request.
LGTM. Can you point to the build on PNC to verify that the build numbers
00007
and00006
match?
ES: http://orch.psi.redhat.com/pnc-web/#/projects/698/build-configs/5267/builds/91431 security: http://orch.psi.redhat.com/pnc-web/#/projects/964/build-configs/5356/builds/91444
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: jcantrill, vimalk78
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/bugzilla refresh
@jcantrill: This pull request references Bugzilla bug 1933978, which is valid.
No GitHub users were found matching the public email listed for the QA contact in Bugzilla (anli@redhat.com), skipping review request.
/cherrypick release-5.0 /cherrypick release-5.1 /cherrypick master
@jcantrill: #2106 failed to apply on top of branch "release-5.0":
Applying: Bug 1933978: Update OD security dependency to resolve kibana index migration issue
Using index info to reconstruct a base tree...
M elasticsearch/Dockerfile.rhel8
M elasticsearch/fetch-artifacts-koji.yaml
Falling back to patching base and 3-way merge...
Auto-merging elasticsearch/fetch-artifacts-koji.yaml
CONFLICT (content): Merge conflict in elasticsearch/fetch-artifacts-koji.yaml
Auto-merging elasticsearch/Dockerfile.rhel8
CONFLICT (content): Merge conflict in elasticsearch/Dockerfile.rhel8
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1933978: Update OD security dependency to resolve kibana index migration issue
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
@vimalk78: #2106 failed to apply on top of branch "release-5.0":
Applying: Bug 1933978: Update OD security dependency to resolve kibana index migration issue
Using index info to reconstruct a base tree...
M elasticsearch/Dockerfile.rhel8
M elasticsearch/fetch-artifacts-koji.yaml
Falling back to patching base and 3-way merge...
Auto-merging elasticsearch/fetch-artifacts-koji.yaml
CONFLICT (content): Merge conflict in elasticsearch/fetch-artifacts-koji.yaml
Auto-merging elasticsearch/Dockerfile.rhel8
CONFLICT (content): Merge conflict in elasticsearch/Dockerfile.rhel8
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1933978: Update OD security dependency to resolve kibana index migration issue
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Description
This PR
/cc @ewolinetz @periklis @vimalk78
/cherrypick release-5.0 /cherrypick release-5.1
Links