Skip to content

Commit 29e331b

Browse files
chore: update 2.21s system-tests version (#14051)
## 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: Charles de Beauchesne <[email protected]>
1 parent 7990c03 commit 29e331b

File tree

3 files changed

+5
-47
lines changed

3 files changed

+5
-47
lines changed

.github/workflows/system-tests.yml

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,6 @@ on:
1111
- cron: '00 04 * * 2-6'
1212

1313
jobs:
14-
system-tests-build-agent:
15-
runs-on: ubuntu-latest
16-
steps:
17-
18-
- name: Checkout system tests
19-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20-
with:
21-
persist-credentials: false
22-
repository: 'DataDog/system-tests'
23-
ref: '41b5ebf2ba153c06c0020b396923dec0d6b1e5bf'
24-
25-
- name: Build agent
26-
run: ./build.sh -i agent
27-
28-
- name: Save
29-
id: save
30-
run: |
31-
docker image save system_tests/agent:latest | gzip > agent_${{ github.sha }}.tar.gz
32-
33-
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
34-
with:
35-
name: agent_${{ github.sha }}
36-
path: |
37-
agent_${{ github.sha }}.tar.gz
38-
retention-days: 2
39-
4014
system-tests-build-weblog:
4115
runs-on: ubuntu-latest
4216
strategy:
@@ -67,7 +41,7 @@ jobs:
6741
with:
6842
persist-credentials: false
6943
repository: 'DataDog/system-tests'
70-
ref: '41b5ebf2ba153c06c0020b396923dec0d6b1e5bf'
44+
ref: 'bb677c0b7d6dd7309d4162f4540bc3d7c604486e'
7145

7246
- name: Checkout dd-trace-py
7347
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -96,7 +70,7 @@ jobs:
9670

9771
system-tests:
9872
runs-on: ubuntu-latest
99-
needs: [system-tests-build-agent, system-tests-build-weblog]
73+
needs: [system-tests-build-weblog]
10074
strategy:
10175
matrix:
10276
weblog-variant: [flask-poc, uwsgi-poc , django-poc, fastapi, python3.12, django-py3.13]
@@ -120,7 +94,7 @@ jobs:
12094
with:
12195
persist-credentials: false
12296
repository: 'DataDog/system-tests'
123-
ref: '41b5ebf2ba153c06c0020b396923dec0d6b1e5bf'
97+
ref: 'bb677c0b7d6dd7309d4162f4540bc3d7c604486e'
12498

12599
- name: Build runner
126100
uses: ./.github/actions/install_runner
@@ -130,16 +104,10 @@ jobs:
130104
name: ${{ matrix.weblog-variant }}_${{ github.sha }}
131105
path: images_artifacts/
132106

133-
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
134-
with:
135-
name: agent_${{ github.sha }}
136-
path: images_artifacts/
137-
138107
- name: docker load
139108
id: docker_load
140109
run: |
141110
docker load < images_artifacts/${{ matrix.weblog-variant}}_weblog_${{ github.sha }}.tar.gz
142-
docker load < images_artifacts/agent_${{ github.sha }}.tar.gz
143111
144112
- name: Run DEFAULT
145113
if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'other'
@@ -294,7 +262,7 @@ jobs:
294262
with:
295263
persist-credentials: false
296264
repository: 'DataDog/system-tests'
297-
ref: '41b5ebf2ba153c06c0020b396923dec0d6b1e5bf'
265+
ref: 'bb677c0b7d6dd7309d4162f4540bc3d7c604486e'
298266
- name: Checkout dd-trace-py
299267
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
300268
with:

.gitlab-ci.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,6 @@ promote-oci-to-staging:
9292
- job: oci-internal-publish
9393
artifacts: true
9494

95-
publish-lib-init-ghcr-tags:
96-
stage: release
97-
rules: null
98-
only:
99-
# TODO: Support publishing rc releases
100-
- /^v[0-9]+\.[0-9]+\.[0-9]+$/
101-
needs:
102-
- job: release_pypi_prod
103-
- job: create-multiarch-lib-injection-image
104-
10595
publish-lib-init-pinned-tags:
10696
stage: release
10797
rules: null

.gitlab/one-pipeline.locked.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT THIS FILE MANUALLY
22
# This file is auto-generated by automation.
33
include:
4-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/f2050f53c1f5aed62a24e6b406c746e7d593230ce02b5d56d2a2296db763ebf4/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/a0486057161f85a77e39ad2aa60ac66bb52414696d9b3dd87177df1057b11295/one-pipeline.yml

0 commit comments

Comments
 (0)