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

chore(ci): pin mariadb container to 10.7 image tag (backport #3913) #4395

Merged
merged 2 commits into from
Oct 27, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 27, 2022

This is an automatic backport of pull request #3913 done by Mergify.


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

MariaDB latest only works on newer versions of Docker (see MariaDB/mariadb-docker#434).

So we are pinning to mariadb:10.7 for now to ensure consistent startup of the container in CircleCI.

(cherry picked from commit 27a55df)
@mergify mergify bot requested a review from a team as a code owner October 27, 2022 13:49
mabdinur
mabdinur previously approved these changes Oct 27, 2022
@mabdinur mabdinur added the changelog/no-changelog A changelog entry is not required for this PR. label Oct 27, 2022
Yun-Kim
Yun-Kim previously approved these changes Oct 27, 2022
@mabdinur
Copy link
Contributor

mabdinur commented Oct 27, 2022

Requires: #4401. Should we combine both backports into one PR, neither will pass on its own.

… (#4401)

* chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)

The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <[email protected]>
Co-authored-by: Munir Abdinur <[email protected]>
(cherry picked from commit 22746a3)

# Conflicts:
#	tests/contrib/mariadb/test_mariadb.py

* fix conflicts and add missing snapshots

Co-authored-by: Brett Langdon <[email protected]>
Co-authored-by: Munir Abdinur <[email protected]>
Co-authored-by: Munir Abdinur <[email protected]>
@Kyle-Verhoog Kyle-Verhoog dismissed stale reviews from Yun-Kim and mabdinur via 567bbb4 October 27, 2022 21:04
@Kyle-Verhoog Kyle-Verhoog merged commit 9de953d into 0.61 Oct 27, 2022
@Kyle-Verhoog Kyle-Verhoog deleted the mergify/bp/0.61/pr-3913 branch October 27, 2022 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants