chore(ci): skip non-linux OCI package creation #12036

randomanderson · 2025-01-23T00:24:56Z

The shared pipeline is introducing support for windows OCI packages. This PR ensure dd-trace-py doesn't generate nonsensical packages. Windows support can be added later.

This was tested by using the WIP branch of one-pipeline

Checklist

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
The change includes or references documentation updates if necessary
Backport labels are set (if applicable)

Reviewer Checklist

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 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

github-actions · 2025-01-23T00:25:30Z

CODEOWNERS have been resolved as:

.gitlab/prepare-oci-package.sh                                          @DataDog/python-guild @DataDog/apm-core-python

datadog-dd-trace-py-rkomorn · 2025-01-23T00:36:39Z

Datadog Report

Branch report: landerson/ignore-windows-oci
Commit report: fa4d507
Test service: dd-trace-py

✅ 0 Failed, 130 Passed, 1468 Skipped, 4m 22.33s Total duration (35m 44.81s time saved)

pr-commenter · 2025-01-23T01:04:18Z

Benchmarks

Benchmark execution time: 2025-01-29 17:54:13

Comparing candidate commit 2cc0171 in PR branch landerson/ignore-windows-oci with baseline commit cb41f8e in branch main.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 394 metrics, 2 unstable metrics.

This reverts commit 7c3b709.

datadog-dd-trace-py-rkomorn · 2025-01-23T17:47:04Z

Datadog Report

Branch report: landerson/ignore-windows-oci
Commit report: 2cc0171
Test service: dd-trace-py

✅ 0 Failed, 130 Passed, 1468 Skipped, 4m 22.59s Total duration (35m 45.53s time saved)

.gitlab/prepare-oci-package.sh

The shared pipeline is introducing support for windows OCI packages. This PR ensure dd-trace-py doesn't generate nonsensical packages. Windows support can be added later. This was tested by using the WIP branch of one-pipeline ## 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) --------- Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com> (cherry picked from commit af9098c)

The shared pipeline is introducing support for windows OCI packages. This PR ensure dd-trace-py doesn't generate nonsensical packages. Windows support can be added later. This was tested by using the WIP branch of one-pipeline ## 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) --------- Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>

This reverts commit 3346ccf.

The shared pipeline is introducing support for windows OCI packages. This PR ensure dd-trace-py doesn't generate nonsensical packages. Windows support can be added later. This was tested by using the WIP branch of one-pipeline ## 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) --------- Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>

This reverts commit df8a701.

This is to ensure no commits on `main` get erased when we force-push `3.x-staging` into `main`. This is to cover the one commit that slipped: #12036 After this is merged, `3.x-staging` should be ready to be merged into `main` safely for dd-trace-py to upgrade to 3.x ## 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) --------- Co-authored-by: Yun Kim <35776586+Yun-Kim@users.noreply.github.com> Co-authored-by: Nicole Cybul <nicole.cybul@datadoghq.com> Co-authored-by: Nick Ripley <nick.ripley@datadoghq.com> Co-authored-by: William Conti <58711692+wconti27@users.noreply.github.com> Co-authored-by: Christophe Papazian <114495376+christophe-papazian@users.noreply.github.com> Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com> Co-authored-by: Laplie Anderson <randomanderson@users.noreply.github.com> Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>

The shared pipeline is introducing support for windows OCI packages. This PR ensure dd-trace-py doesn't generate nonsensical packages. Windows support can be added later. This was tested by using the WIP branch of one-pipeline ## 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) --------- Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>

This is to ensure no commits on `main` get erased when we force-push `3.x-staging` into `main`. This is to cover the one commit that slipped: #12036 After this is merged, `3.x-staging` should be ready to be merged into `main` safely for dd-trace-py to upgrade to 3.x ## 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) --------- Co-authored-by: Yun Kim <35776586+Yun-Kim@users.noreply.github.com> Co-authored-by: Nicole Cybul <nicole.cybul@datadoghq.com> Co-authored-by: Nick Ripley <nick.ripley@datadoghq.com> Co-authored-by: William Conti <58711692+wconti27@users.noreply.github.com> Co-authored-by: Christophe Papazian <114495376+christophe-papazian@users.noreply.github.com> Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com> Co-authored-by: Laplie Anderson <randomanderson@users.noreply.github.com> Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>

randomanderson added 4 commits January 22, 2025 12:54

Ignore windows oci package building

2b261ad

Use the WIP branch of one-pipeline

7c3b709

Invert the logic to specific not linux

28b93fe

Skip package creation completely if not linux

fa4d507

randomanderson added changelog/no-changelog A changelog entry is not required for this PR. CI labels Jan 23, 2025

randomanderson changed the title ~~chore(ci): only support creating linux OCI packages~~ chore(ci): skip non-linux OCI package creation Jan 23, 2025

Revert "Use the WIP branch of one-pipeline"

a0086b4

This reverts commit 7c3b709.

brettlangdon added backport 2.15 backport 2.16 backport 2.17 backport 2.18 backport 2.19 backport 2.20 labels Jan 23, 2025

randomanderson marked this pull request as ready for review January 25, 2025 04:01

randomanderson requested review from a team as code owners January 25, 2025 04:01

randomanderson requested review from avara1986 and erikayasuda January 25, 2025 04:01

erikayasuda reviewed Jan 27, 2025

View reviewed changes

.gitlab/prepare-oci-package.sh Show resolved Hide resolved

randomanderson enabled auto-merge (squash) January 27, 2025 09:57

Merge branch 'main' into landerson/ignore-windows-oci

050506b

erikayasuda approved these changes Jan 27, 2025

View reviewed changes

randomanderson and others added 2 commits January 29, 2025 05:08

Merge branch 'main' into landerson/ignore-windows-oci

46aca73

Merge branch 'main' into landerson/ignore-windows-oci

2cc0171

erikayasuda disabled auto-merge January 30, 2025 10:34

erikayasuda merged commit af9098c into main Jan 30, 2025
680 checks passed

erikayasuda deleted the landerson/ignore-windows-oci branch January 30, 2025 10:34

github-actions bot mentioned this pull request Jan 30, 2025

chore(ci): skip non-linux OCI package creation [backport 2.15] #12156

Open

2 tasks

github-actions bot mentioned this pull request Jan 30, 2025

chore(ci): skip non-linux OCI package creation [backport 2.16] #12157

Open

2 tasks

github-actions bot mentioned this pull request Jan 30, 2025

chore(ci): skip non-linux OCI package creation [backport 2.17] #12158

Open

2 tasks

github-actions bot mentioned this pull request Jan 30, 2025

chore(ci): skip non-linux OCI package creation [backport 2.18] #12159

Open

2 tasks

github-actions bot mentioned this pull request Jan 30, 2025

chore(ci): skip non-linux OCI package creation [backport 2.19] #12160

Open

2 tasks

github-actions bot mentioned this pull request Jan 30, 2025

chore(ci): skip non-linux OCI package creation [backport 2.20] #12161

Open

2 tasks

avara1986 added a commit that referenced this pull request Feb 4, 2025

Revert "chore(ci): skip non-linux OCI package creation (#12036)"

d162de8

This reverts commit 3346ccf.

avara1986 added a commit that referenced this pull request Feb 4, 2025

Revert "chore(ci): skip non-linux OCI package creation (#12036)"

8657bba

This reverts commit df8a701.

erikayasuda mentioned this pull request Feb 6, 2025

chore: update 3.x-staging with main #12244

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(ci): skip non-linux OCI package creation #12036

chore(ci): skip non-linux OCI package creation #12036

randomanderson commented Jan 23, 2025 •

edited by erikayasuda

Loading

github-actions bot commented Jan 23, 2025 •

edited

Loading

datadog-dd-trace-py-rkomorn bot commented Jan 23, 2025

pr-commenter bot commented Jan 23, 2025 •

edited

Loading

datadog-dd-trace-py-rkomorn bot commented Jan 23, 2025 •

edited

Loading

chore(ci): skip non-linux OCI package creation #12036

chore(ci): skip non-linux OCI package creation #12036

Conversation

randomanderson commented Jan 23, 2025 • edited by erikayasuda Loading

Checklist

Reviewer Checklist

github-actions bot commented Jan 23, 2025 • edited Loading

datadog-dd-trace-py-rkomorn bot commented Jan 23, 2025

Datadog Report

pr-commenter bot commented Jan 23, 2025 • edited Loading

Benchmarks

datadog-dd-trace-py-rkomorn bot commented Jan 23, 2025 • edited Loading

Datadog Report

randomanderson commented Jan 23, 2025 •

edited by erikayasuda

Loading

github-actions bot commented Jan 23, 2025 •

edited

Loading

pr-commenter bot commented Jan 23, 2025 •

edited

Loading

datadog-dd-trace-py-rkomorn bot commented Jan 23, 2025 •

edited

Loading