Skip to content

Commit b9722ed

Browse files
committed
Extract ddev, datadog_checks_base and datadog_checks_dev to separate workflows
Include them as a separate job in relevant workflows
1 parent 458274d commit b9722ed

File tree

13 files changed

+538
-184
lines changed

13 files changed

+538
-184
lines changed

.github/workflows/master.yml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,35 @@ jobs:
99
cache:
1010
uses: ./.github/workflows/cache-shared-deps.yml
1111

12-
test:
12+
test-common:
1313
needs:
1414
- cache
1515

16-
uses: ./.github/workflows/test-all.yml
16+
uses: ./.github/workflows/tests/test-common.yml
17+
with:
18+
repo: core
19+
20+
# Options
21+
standard: true
22+
secrets: inherit
23+
24+
test-dbm:
25+
needs:
26+
- cache
27+
28+
uses: ./.github/workflows/tests/test-dbm.yml
29+
with:
30+
repo: core
31+
32+
# Options
33+
standard: true
34+
secrets: inherit
35+
36+
test-integrations:
37+
needs:
38+
- cache
39+
40+
uses: ./.github/workflows/tests/test-all.yml
1741
with:
1842
repo: core
1943

@@ -23,7 +47,8 @@ jobs:
2347

2448
publish-test-results:
2549
needs:
26-
- test
50+
- test-common
51+
- test-integrations
2752
if: success() || failure()
2853
concurrency:
2954
group: test-results
@@ -33,7 +58,8 @@ jobs:
3358

3459
submit-traces:
3560
needs:
36-
- test
61+
- test-common
62+
- test-integrations
3763
if: success() || failure()
3864

3965
uses: ./.github/workflows/submit-traces.yml

.github/workflows/nightly-base-package.yml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,30 @@ on:
66
- cron: "0 5 * * *"
77

88
jobs:
9-
test:
10-
uses: ./.github/workflows/test-all.yml
9+
test-common:
10+
uses: ./.github/workflows/tests/test-common.yml
11+
with:
12+
repo: core
13+
14+
# Options
15+
standard: true
16+
minimum-base-package: true
17+
test-py2: true
18+
secrets: inherit
19+
20+
test-dbm:
21+
uses: ./.github/workflows/tests/test-dbm.yml
22+
with:
23+
repo: core
24+
25+
# Options
26+
standard: true
27+
minimum-base-package: true
28+
test-py2: true
29+
secrets: inherit
30+
31+
test-integrations:
32+
uses: ./.github/workflows/tests/test-all.yml
1133
with:
1234
repo: core
1335

@@ -19,7 +41,8 @@ jobs:
1941

2042
submit-traces:
2143
needs:
22-
- test
44+
- test-common
45+
- test-integrations
2346
if: success() || failure()
2447

2548
uses: ./.github/workflows/submit-traces.yml

.github/workflows/nightly-py2.yml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,30 @@ on:
66
- cron: "0 4 * * *"
77

88
jobs:
9-
test:
10-
uses: ./.github/workflows/test-all.yml
9+
test-common:
10+
uses: ./.github/workflows/tests/test-common.yml
11+
with:
12+
repo: core
13+
14+
# Options
15+
standard: true
16+
test-py2: true
17+
test-py3: false
18+
secrets: inherit
19+
20+
test-dbm:
21+
uses: ./.github/workflows/tests/test-dbm.yml
22+
with:
23+
repo: core
24+
25+
# Options
26+
standard: true
27+
test-py2: true
28+
test-py3: false
29+
secrets: inherit
30+
31+
test-integrations:
32+
uses: ./.github/workflows/tests/test-all.yml
1133
with:
1234
repo: core
1335

@@ -19,7 +41,8 @@ jobs:
1941

2042
submit-traces:
2143
needs:
22-
- test
44+
- test-common
45+
- test-integrations
2346
if: success() || failure()
2447

2548
uses: ./.github/workflows/submit-traces.yml

.github/workflows/pr-all.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,28 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18-
test:
19-
uses: ./.github/workflows/test-all.yml
18+
test-common:
19+
uses: ./.github/workflows/tests/test-common.yml
20+
with:
21+
repo: core
22+
23+
# Options
24+
standard: true
25+
test-py2: true
26+
secrets: inherit
27+
28+
test-dbm:
29+
uses: ./.github/workflows/tests/test-dbm.yml
30+
with:
31+
repo: core
32+
33+
# Options
34+
standard: true
35+
test-py2: true
36+
secrets: inherit
37+
38+
test-integrations:
39+
uses: ./.github/workflows/tests/test-all.yml
2040
with:
2141
repo: core
2242

@@ -27,14 +47,16 @@ jobs:
2747

2848
save-event:
2949
needs:
30-
- test
50+
- test-common
51+
- test-integrations
3152
if: success() || failure()
3253

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

3556
submit-traces:
3657
needs:
37-
- test
58+
- test-common
59+
- test-integrations
3860
if: success() || failure()
3961

4062
uses: ./.github/workflows/submit-traces.yml

.github/workflows/test-agent.yml

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,38 @@ on:
3535
type: string
3636

3737
jobs:
38-
test:
39-
uses: ./.github/workflows/test-all.yml
38+
test-common:
39+
uses: ./.github/workflows/tests/test-common.yml
40+
with:
41+
repo: core
42+
43+
# Options
44+
standard: true
45+
test-py2: ${{ inputs.test-py2 }}
46+
test-py3: ${{ inputs.test-py3 }}
47+
agent-image: "${{ inputs.agent-image }}"
48+
agent-image-py2: "${{ inputs.agent-image-py2 }}"
49+
agent-image-windows: "${{ inputs.agent-image-windows }}"
50+
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
51+
secrets: inherit
52+
53+
test-dbm:
54+
uses: ./.github/workflows/tests/test-dbm.yml
55+
with:
56+
repo: core
57+
58+
# Options
59+
standard: true
60+
test-py2: ${{ inputs.test-py2 }}
61+
test-py3: ${{ inputs.test-py3 }}
62+
agent-image: "${{ inputs.agent-image }}"
63+
agent-image-py2: "${{ inputs.agent-image-py2 }}"
64+
agent-image-windows: "${{ inputs.agent-image-windows }}"
65+
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
66+
secrets: inherit
67+
68+
test-integrations:
69+
uses: ./.github/workflows/tests/test-all.yml
4070
with:
4171
repo: core
4272

@@ -52,7 +82,8 @@ jobs:
5282

5383
submit-traces:
5484
needs:
55-
- test
85+
- test-common
86+
- test-integrations
5687
if: success() || failure()
5788

5889
uses: ./.github/workflows/submit-traces.yml

0 commit comments

Comments
 (0)