Skip to content

Commit

Permalink
Extract ddev, datadog_checks_base and datadog_checks_dev to separate …
Browse files Browse the repository at this point in the history
…workflows

Include them as a separate job in relevant workflows
  • Loading branch information
vivek-datadog committed May 23, 2024
1 parent 458274d commit b9722ed
Show file tree
Hide file tree
Showing 13 changed files with 538 additions and 184 deletions.
34 changes: 30 additions & 4 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,35 @@ jobs:
cache:
uses: ./.github/workflows/cache-shared-deps.yml

test:
test-common:
needs:
- cache

uses: ./.github/workflows/test-all.yml
uses: ./.github/workflows/tests/test-common.yml
with:
repo: core

# Options
standard: true
secrets: inherit

test-dbm:
needs:
- cache

uses: ./.github/workflows/tests/test-dbm.yml
with:
repo: core

# Options
standard: true
secrets: inherit

test-integrations:
needs:
- cache

uses: ./.github/workflows/tests/test-all.yml
with:
repo: core

Expand All @@ -23,7 +47,8 @@ jobs:

publish-test-results:
needs:
- test
- test-common
- test-integrations
if: success() || failure()
concurrency:
group: test-results
Expand All @@ -33,7 +58,8 @@ jobs:

submit-traces:
needs:
- test
- test-common
- test-integrations
if: success() || failure()

uses: ./.github/workflows/submit-traces.yml
Expand Down
29 changes: 26 additions & 3 deletions .github/workflows/nightly-base-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,30 @@ on:
- cron: "0 5 * * *"

jobs:
test:
uses: ./.github/workflows/test-all.yml
test-common:
uses: ./.github/workflows/tests/test-common.yml
with:
repo: core

# Options
standard: true
minimum-base-package: true
test-py2: true
secrets: inherit

test-dbm:
uses: ./.github/workflows/tests/test-dbm.yml
with:
repo: core

# Options
standard: true
minimum-base-package: true
test-py2: true
secrets: inherit

test-integrations:
uses: ./.github/workflows/tests/test-all.yml
with:
repo: core

Expand All @@ -19,7 +41,8 @@ jobs:

submit-traces:
needs:
- test
- test-common
- test-integrations
if: success() || failure()

uses: ./.github/workflows/submit-traces.yml
Expand Down
29 changes: 26 additions & 3 deletions .github/workflows/nightly-py2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,30 @@ on:
- cron: "0 4 * * *"

jobs:
test:
uses: ./.github/workflows/test-all.yml
test-common:
uses: ./.github/workflows/tests/test-common.yml
with:
repo: core

# Options
standard: true
test-py2: true
test-py3: false
secrets: inherit

test-dbm:
uses: ./.github/workflows/tests/test-dbm.yml
with:
repo: core

# Options
standard: true
test-py2: true
test-py3: false
secrets: inherit

test-integrations:
uses: ./.github/workflows/tests/test-all.yml
with:
repo: core

Expand All @@ -19,7 +41,8 @@ jobs:

submit-traces:
needs:
- test
- test-common
- test-integrations
if: success() || failure()

uses: ./.github/workflows/submit-traces.yml
Expand Down
30 changes: 26 additions & 4 deletions .github/workflows/pr-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,28 @@ concurrency:
cancel-in-progress: true

jobs:
test:
uses: ./.github/workflows/test-all.yml
test-common:
uses: ./.github/workflows/tests/test-common.yml
with:
repo: core

# Options
standard: true
test-py2: true
secrets: inherit

test-dbm:
uses: ./.github/workflows/tests/test-dbm.yml
with:
repo: core

# Options
standard: true
test-py2: true
secrets: inherit

test-integrations:
uses: ./.github/workflows/tests/test-all.yml
with:
repo: core

Expand All @@ -27,14 +47,16 @@ jobs:

save-event:
needs:
- test
- test-common
- test-integrations
if: success() || failure()

uses: ./.github/workflows/save-event.yml

submit-traces:
needs:
- test
- test-common
- test-integrations
if: success() || failure()

uses: ./.github/workflows/submit-traces.yml
Expand Down
37 changes: 34 additions & 3 deletions .github/workflows/test-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,38 @@ on:
type: string

jobs:
test:
uses: ./.github/workflows/test-all.yml
test-common:
uses: ./.github/workflows/tests/test-common.yml
with:
repo: core

# Options
standard: true
test-py2: ${{ inputs.test-py2 }}
test-py3: ${{ inputs.test-py3 }}
agent-image: "${{ inputs.agent-image }}"
agent-image-py2: "${{ inputs.agent-image-py2 }}"
agent-image-windows: "${{ inputs.agent-image-windows }}"
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
secrets: inherit

test-dbm:
uses: ./.github/workflows/tests/test-dbm.yml
with:
repo: core

# Options
standard: true
test-py2: ${{ inputs.test-py2 }}
test-py3: ${{ inputs.test-py3 }}
agent-image: "${{ inputs.agent-image }}"
agent-image-py2: "${{ inputs.agent-image-py2 }}"
agent-image-windows: "${{ inputs.agent-image-windows }}"
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
secrets: inherit

test-integrations:
uses: ./.github/workflows/tests/test-all.yml
with:
repo: core

Expand All @@ -52,7 +82,8 @@ jobs:

submit-traces:
needs:
- test
- test-common
- test-integrations
if: success() || failure()

uses: ./.github/workflows/submit-traces.yml
Expand Down
Loading

0 comments on commit b9722ed

Please sign in to comment.