Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 4 additions & 36 deletions .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,6 @@ on:
- cron: '00 04 * * 2-6'

jobs:
system-tests-build-agent:
runs-on: ubuntu-latest
steps:

- name: Checkout system tests
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
repository: 'DataDog/system-tests'
ref: '41b5ebf2ba153c06c0020b396923dec0d6b1e5bf'

- name: Build agent
run: ./build.sh -i agent

- name: Save
id: save
run: |
docker image save system_tests/agent:latest | gzip > agent_${{ github.sha }}.tar.gz

- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: agent_${{ github.sha }}
path: |
agent_${{ github.sha }}.tar.gz
retention-days: 2

system-tests-build-weblog:
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -67,7 +41,7 @@ jobs:
with:
persist-credentials: false
repository: 'DataDog/system-tests'
ref: '41b5ebf2ba153c06c0020b396923dec0d6b1e5bf'
ref: 'bb677c0b7d6dd7309d4162f4540bc3d7c604486e'

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

system-tests:
runs-on: ubuntu-latest
needs: [system-tests-build-agent, system-tests-build-weblog]
needs: [system-tests-build-weblog]
strategy:
matrix:
weblog-variant: [flask-poc, uwsgi-poc , django-poc, fastapi, python3.12, django-py3.13]
Expand All @@ -120,7 +94,7 @@ jobs:
with:
persist-credentials: false
repository: 'DataDog/system-tests'
ref: '41b5ebf2ba153c06c0020b396923dec0d6b1e5bf'
ref: 'bb677c0b7d6dd7309d4162f4540bc3d7c604486e'

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

- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
name: agent_${{ github.sha }}
path: images_artifacts/

- name: docker load
id: docker_load
run: |
docker load < images_artifacts/${{ matrix.weblog-variant}}_weblog_${{ github.sha }}.tar.gz
docker load < images_artifacts/agent_${{ github.sha }}.tar.gz

- name: Run DEFAULT
if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'other'
Expand Down Expand Up @@ -294,7 +262,7 @@ jobs:
with:
persist-credentials: false
repository: 'DataDog/system-tests'
ref: '41b5ebf2ba153c06c0020b396923dec0d6b1e5bf'
ref: 'bb677c0b7d6dd7309d4162f4540bc3d7c604486e'
- name: Checkout dd-trace-py
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
Expand Down
10 changes: 0 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,6 @@ promote-oci-to-staging:
- job: oci-internal-publish
artifacts: true

publish-lib-init-ghcr-tags:
stage: release
rules: null
only:
# TODO: Support publishing rc releases
- /^v[0-9]+\.[0-9]+\.[0-9]+$/
needs:
- job: release_pypi_prod
- job: create-multiarch-lib-injection-image

publish-lib-init-pinned-tags:
stage: release
rules: null
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/one-pipeline.locked.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT THIS FILE MANUALLY
# This file is auto-generated by automation.
include:
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/f2050f53c1f5aed62a24e6b406c746e7d593230ce02b5d56d2a2296db763ebf4/one-pipeline.yml
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/a0486057161f85a77e39ad2aa60ac66bb52414696d9b3dd87177df1057b11295/one-pipeline.yml
Loading