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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Jul 6, 2022
Merged

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

merged 2 commits into from
Jul 6, 2022

Conversation

brettlangdon
Copy link
Member

@brettlangdon brettlangdon commented Jul 6, 2022 •
edited by Kyle-Verhoog
Loading

Description

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.

https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/18717/workflows/de909835-3fae-4a51-b620-5e94da79d81b/jobs/1267024

Checklist

Reviewer Checklist

  • Title is accurate.
  • Description motivates each change.
  • No unnecessary changes were introduced in this PR.
  • PR cannot be broken up into smaller PRs.
  • Avoid breaking API changes unless absolutely necessary.
  • Tests provided or description of manual testing performed is included in the code or PR.
  • Release note has been added for fixes and features, or else changelog/no-changelog label added.
  • All relevant GitHub issues are correctly linked.
  • Backports are identified and tagged with Mergifyio.
  • Add to milestone.

@brettlangdon brettlangdon added the changelog/no-changelog A changelog entry is not required for this PR. label Jul 6, 2022
@brettlangdon brettlangdon requested a review from a team as a code owner July 6, 2022 17:37
@brettlangdon
Copy link
Member Author

@Mergifyio backport 0.x 1.2

@mergify
Copy link
Contributor

mergify bot commented Jul 6, 2022

backport 0.x 1.2

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@Kyle-Verhoog Kyle-Verhoog merged commit 27a55df into 1.x Jul 6, 2022
@Kyle-Verhoog Kyle-Verhoog deleted the pin.mariadb branch July 6, 2022 17:52
mergify bot pushed a commit that referenced this pull request Jul 6, 2022
@brettlangdon @mergify
chore(ci): pin mariadb container to 10.7 image tag (#3913)
1d85338 
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 mentioned this pull request Jul 6, 2022
Merged
mergify bot pushed a commit that referenced this pull request Jul 6, 2022
@brettlangdon @mergify
chore(ci): pin mariadb container to 10.7 image tag (#3913)
e55ac91 
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 mentioned this pull request Jul 6, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Jul 6, 2022

backport 0.x 1.2

✅ Backports have been created

@github-actions github-actions bot added this to the v1.3.0 milestone Jul 6, 2022
Kyle-Verhoog pushed a commit that referenced this pull request Jul 6, 2022
@mergify @brettlangdon
chore(ci): pin mariadb container to 10.7 image tag (#3913) (#3915)
cabea53 
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)

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
brettlangdon added a commit that referenced this pull request Jul 6, 2022
@mergify @brettlangdon
chore(ci): pin mariadb container to 10.7 image tag (#3913) (#3914)
97677f8 
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)

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
@brettlangdon
Copy link
Member Author

@Mergifyio backport 1.1 1.0

mergify bot pushed a commit that referenced this pull request Jul 6, 2022
@brettlangdon @mergify
chore(ci): pin mariadb container to 10.7 image tag (#3913)
165d461 
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 mentioned this pull request Jul 6, 2022
Merged
mergify bot pushed a commit that referenced this pull request Jul 6, 2022
@brettlangdon @mergify
chore(ci): pin mariadb container to 10.7 image tag (#3913)
0f05d59 
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 mentioned this pull request Jul 6, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Jul 6, 2022

backport 1.1 1.0

✅ Backports have been created

Kyle-Verhoog pushed a commit that referenced this pull request Jul 6, 2022
@mergify @brettlangdon
chore(ci): pin mariadb container to 10.7 image tag (#3913) (#3916)
3601eb9 
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)

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Kyle-Verhoog pushed a commit that referenced this pull request Jul 6, 2022
@mergify @brettlangdon
chore(ci): pin mariadb container to 10.7 image tag (#3913) (#3917)
a2f14ba 
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)

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
mergify bot added a commit that referenced this pull request Aug 16, 2022
@mergify
chore(ci): pin mariadb container to 10.7 image tag (#3913) (#3914)
f39bac1 
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)

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
(cherry picked from commit 97677f8)
@majorgreys
Copy link
Contributor

@Mergifyio backport 0.61

@mergify mergify bot mentioned this pull request Oct 27, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Oct 27, 2022

backport 0.61

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Oct 27, 2022
@brettlangdon @mergify
chore(ci): pin mariadb container to 10.7 image tag (#3913)
8f4c342 
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)
Kyle-Verhoog pushed a commit that referenced this pull request Oct 27, 2022
@mergify @brettlangdon @mabdinur
chore(ci): pin mariadb container to 10.7 image tag (backport #3913) (#…
9de953d 
…4395)

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

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)

* chore(mariadb): update tests to support mariadb>=1.1.0 (backport #3883) (#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 <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)

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

* fix conflicts and add missing snapshots

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
@grooverdan grooverdan mentioned this pull request Dec 2, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kyle-Verhoog Kyle-Verhoog Kyle-Verhoog approved these changes

Assignees
No one assigned
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Milestone
v1.3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@brettlangdon @majorgreys @Kyle-Verhoog