Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.5](backport #33789) Update test versions of NGINX, Apache and MongoDB #33844

Merged
merged 2 commits into from
Nov 30, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2022

This is an automatic backport of pull request #33789 done by Mergify.
Cherry-pick of 4f639d7 has failed:

On branch mergify/bp/8.5/pr-33789
Your branch is up to date with 'origin/8.5'.

You are currently cherry-picking commit 4f639d7ed6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/check-docs.yml
	modified:   metricbeat/docs/modules/apache.asciidoc
	modified:   metricbeat/docs/modules/nginx.asciidoc
	modified:   metricbeat/module/apache/_meta/Dockerfile
	modified:   metricbeat/module/apache/_meta/docs.asciidoc
	modified:   metricbeat/module/apache/_meta/httpd.conf
	modified:   metricbeat/module/apache/_meta/supported-versions.yml
	modified:   metricbeat/module/apache/docker-compose.yml
	modified:   metricbeat/module/logstash/logstash_integration_test.go
	modified:   metricbeat/module/mongodb/_meta/Dockerfile
	modified:   metricbeat/module/mongodb/docker-compose.yml
	modified:   metricbeat/module/nginx/_meta/Dockerfile
	modified:   metricbeat/module/nginx/_meta/docs.asciidoc
	modified:   metricbeat/module/nginx/docker-compose.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

The old tests were based on Debian Jessie released in April
2015 (end-of-life on June 30, 2020).

We started having problems with expired GPG keys when installing
dependencies in our Docker files.

Also:
* Add the missing MPM module and the `ServerName` directive for Apache.
* Add retries to Logstash tests because they are flaky
* Do not install mage v1.14.0
* Update elastic-agent-client version to avoid broken agent dependency

(cherry picked from commit 4f639d7)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested review from a team as code owners November 28, 2022 18:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 28, 2022
@mergify mergify bot requested review from faec and leehinman and removed request for a team November 28, 2022 18:14
@mergify mergify bot assigned rdner Nov 28, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 28, 2022
@botelastic
Copy link

botelastic bot commented Nov 28, 2022

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 28, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-11-30T10:40:04.425+0000

  • Duration: 121 min 10 sec

Test stats 🧪

Test Results
Failed 0
Passed 23695
Skipped 1950
Total 25645

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@rdner
Copy link
Member

rdner commented Nov 28, 2022

I'll need to resolve conflicts in the files.

@rdner rdner merged commit 8c7cc70 into 8.5 Nov 30, 2022
@rdner rdner deleted the mergify/bp/8.5/pr-33789 branch November 30, 2022 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants