Skip to content

Commit 7fd3c13

Browse files
authored
ci: update one-pipeline fixing failing auto_inject test [backport 2.21] (#13667)
Cherry picks #13398 and #13660 to 2.21 ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
1 parent 7615f42 commit 7fd3c13

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ default:
2020
interruptible: true
2121

2222
include:
23-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/include/one-pipeline.yml
23+
- local: ".gitlab/one-pipeline.locked.yml"
2424
- local: ".gitlab/services.yml" # Include early so others can use the definitions
2525
- local: ".gitlab/benchmarks.yml"
2626
- local: ".gitlab/package.yml"

.gitlab/one-pipeline.locked.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# DO NOT EDIT THIS FILE MANUALLY
2+
# This file is auto-generated by automation.
3+
include:
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/f2050f53c1f5aed62a24e6b406c746e7d593230ce02b5d56d2a2296db763ebf4/one-pipeline.yml

0 commit comments

Comments
 (0)