Skip to content

Commit 78ad504

Browse files
vivek-datadogvivek-datadog
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 78ad504

File tree

11 files changed

+344
-183
lines changed

11 files changed

+344
-183
lines changed

‎.github/workflows/master.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,23 @@ 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-integrations:
25+
needs:
26+
- cache
27+
28+
uses: ./.github/workflows/tests/test-all.yml
1729
with:
1830
repo: core
1931

@@ -23,7 +35,8 @@ jobs:
2335

2436
publish-test-results:
2537
needs:
26-
- test
38+
- test-common
39+
- test-integrations
2740
if: success() || failure()
2841
concurrency:
2942
group: test-results
@@ -33,7 +46,8 @@ jobs:
3346

3447
submit-traces:
3548
needs:
36-
- test
49+
- test-common
50+
- test-integrations
3751
if: success() || failure()
3852

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

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,19 @@ 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-integrations:
21+
uses: ./.github/workflows/tests/test-all.yml
1122
with:
1223
repo: core
1324

@@ -19,7 +30,8 @@ jobs:
1930

2031
submit-traces:
2132
needs:
22-
- test
33+
- test-common
34+
- test-integrations
2335
if: success() || failure()
2436

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

‎.github/workflows/nightly-py2.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,19 @@ 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-integrations:
21+
uses: ./.github/workflows/tests/test-all.yml
1122
with:
1223
repo: core
1324

@@ -19,7 +30,8 @@ jobs:
1930

2031
submit-traces:
2132
needs:
22-
- test
33+
- test-common
34+
- test-integrations
2335
if: success() || failure()
2436

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

‎.github/workflows/pr-all.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,18 @@ 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-integrations:
29+
uses: ./.github/workflows/tests/test-all.yml
2030
with:
2131
repo: core
2232

@@ -27,14 +37,16 @@ jobs:
2737

2838
save-event:
2939
needs:
30-
- test
40+
- test-common
41+
- test-integrations
3142
if: success() || failure()
3243

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

3546
submit-traces:
3647
needs:
37-
- test
48+
- test-common
49+
- test-integrations
3850
if: success() || failure()
3951

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

‎.github/workflows/test-agent.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,23 @@ 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-integrations:
54+
uses: ./.github/workflows/tests/test-all.yml
4055
with:
4156
repo: core
4257

@@ -52,7 +67,8 @@ jobs:
5267

5368
submit-traces:
5469
needs:
55-
- test
70+
- test-common
71+
- test-integrations
5672
if: success() || failure()
5773

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

‎.github/workflows/test-all.yml renamed to ‎.github/workflows/tests/test-all.yml

Lines changed: 1 addition & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test all
1+
name: Test all integrations
22

33
on:
44
workflow_call:
@@ -49,158 +49,6 @@ on:
4949
type: string
5050

5151
jobs:
52-
jd316aba:
53-
uses: ./.github/workflows/test-target.yml
54-
with:
55-
job-name: ddev on Linux
56-
target: ddev
57-
platform: linux
58-
runner: '["ubuntu-22.04"]'
59-
repo: "${{ inputs.repo }}"
60-
python-version: "${{ inputs.python-version }}"
61-
standard: ${{ inputs.standard }}
62-
latest: ${{ inputs.latest }}
63-
agent-image: "${{ inputs.agent-image }}"
64-
agent-image-py2: "${{ inputs.agent-image-py2 }}"
65-
agent-image-windows: "${{ inputs.agent-image-windows }}"
66-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
67-
test-py2: ${{ inputs.test-py2 }}
68-
test-py3: ${{ inputs.test-py3 }}
69-
minimum-base-package: ${{ inputs.minimum-base-package }}
70-
secrets: inherit
71-
j6712d43:
72-
uses: ./.github/workflows/test-target.yml
73-
with:
74-
job-name: ddev on Windows
75-
target: ddev
76-
platform: windows
77-
runner: '["windows-2022"]'
78-
repo: "${{ inputs.repo }}"
79-
python-version: "${{ inputs.python-version }}"
80-
standard: ${{ inputs.standard }}
81-
latest: ${{ inputs.latest }}
82-
agent-image: "${{ inputs.agent-image }}"
83-
agent-image-py2: "${{ inputs.agent-image-py2 }}"
84-
agent-image-windows: "${{ inputs.agent-image-windows }}"
85-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
86-
test-py2: ${{ inputs.test-py2 }}
87-
test-py3: ${{ inputs.test-py3 }}
88-
minimum-base-package: ${{ inputs.minimum-base-package }}
89-
secrets: inherit
90-
jb232c8c:
91-
uses: ./.github/workflows/test-target.yml
92-
with:
93-
job-name: Datadog Checks Base on Linux
94-
target: datadog_checks_base
95-
platform: linux
96-
runner: '["ubuntu-22.04"]'
97-
repo: "${{ inputs.repo }}"
98-
python-version: "${{ inputs.python-version }}"
99-
standard: ${{ inputs.standard }}
100-
latest: ${{ inputs.latest }}
101-
agent-image: "${{ inputs.agent-image }}"
102-
agent-image-py2: "${{ inputs.agent-image-py2 }}"
103-
agent-image-windows: "${{ inputs.agent-image-windows }}"
104-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
105-
test-py2: ${{ inputs.test-py2 }}
106-
test-py3: ${{ inputs.test-py3 }}
107-
minimum-base-package: ${{ inputs.minimum-base-package }}
108-
secrets: inherit
109-
jda96080:
110-
uses: ./.github/workflows/test-target.yml
111-
with:
112-
job-name: Datadog Checks Base on Windows
113-
target: datadog_checks_base
114-
platform: windows
115-
runner: '["windows-2022"]'
116-
repo: "${{ inputs.repo }}"
117-
python-version: "${{ inputs.python-version }}"
118-
standard: ${{ inputs.standard }}
119-
latest: ${{ inputs.latest }}
120-
agent-image: "${{ inputs.agent-image }}"
121-
agent-image-py2: "${{ inputs.agent-image-py2 }}"
122-
agent-image-windows: "${{ inputs.agent-image-windows }}"
123-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
124-
test-py2: ${{ inputs.test-py2 }}
125-
test-py3: ${{ inputs.test-py3 }}
126-
minimum-base-package: ${{ inputs.minimum-base-package }}
127-
secrets: inherit
128-
j77217e9:
129-
uses: ./.github/workflows/test-target.yml
130-
with:
131-
job-name: Datadog Checks Dev on Linux
132-
target: datadog_checks_dev
133-
platform: linux
134-
runner: '["ubuntu-22.04"]'
135-
repo: "${{ inputs.repo }}"
136-
python-version: "${{ inputs.python-version }}"
137-
standard: ${{ inputs.standard }}
138-
latest: ${{ inputs.latest }}
139-
agent-image: "${{ inputs.agent-image }}"
140-
agent-image-py2: "${{ inputs.agent-image-py2 }}"
141-
agent-image-windows: "${{ inputs.agent-image-windows }}"
142-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
143-
test-py2: ${{ inputs.test-py2 }}
144-
test-py3: ${{ inputs.test-py3 }}
145-
minimum-base-package: ${{ inputs.minimum-base-package }}
146-
secrets: inherit
147-
j1176210:
148-
uses: ./.github/workflows/test-target.yml
149-
with:
150-
job-name: Datadog Checks Dev on Windows
151-
target: datadog_checks_dev
152-
platform: windows
153-
runner: '["windows-2022"]'
154-
repo: "${{ inputs.repo }}"
155-
python-version: "${{ inputs.python-version }}"
156-
standard: ${{ inputs.standard }}
157-
latest: ${{ inputs.latest }}
158-
agent-image: "${{ inputs.agent-image }}"
159-
agent-image-py2: "${{ inputs.agent-image-py2 }}"
160-
agent-image-windows: "${{ inputs.agent-image-windows }}"
161-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
162-
test-py2: ${{ inputs.test-py2 }}
163-
test-py3: ${{ inputs.test-py3 }}
164-
minimum-base-package: ${{ inputs.minimum-base-package }}
165-
secrets: inherit
166-
j8cdb65b:
167-
uses: ./.github/workflows/test-target.yml
168-
with:
169-
job-name: Datadog Checks Downloader on Linux
170-
target: datadog_checks_downloader
171-
platform: linux
172-
runner: '["ubuntu-22.04"]'
173-
repo: "${{ inputs.repo }}"
174-
python-version: "${{ inputs.python-version }}"
175-
standard: ${{ inputs.standard }}
176-
latest: ${{ inputs.latest }}
177-
agent-image: "${{ inputs.agent-image }}"
178-
agent-image-py2: "${{ inputs.agent-image-py2 }}"
179-
agent-image-windows: "${{ inputs.agent-image-windows }}"
180-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
181-
test-py2: ${{ inputs.test-py2 }}
182-
test-py3: ${{ inputs.test-py3 }}
183-
minimum-base-package: ${{ inputs.minimum-base-package }}
184-
secrets: inherit
185-
j8c73c41:
186-
uses: ./.github/workflows/test-target.yml
187-
with:
188-
job-name: Datadog Checks Downloader on Windows
189-
target: datadog_checks_downloader
190-
platform: windows
191-
runner: '["windows-2022"]'
192-
repo: "${{ inputs.repo }}"
193-
python-version: "${{ inputs.python-version }}"
194-
standard: ${{ inputs.standard }}
195-
latest: ${{ inputs.latest }}
196-
agent-image: "${{ inputs.agent-image }}"
197-
agent-image-py2: "${{ inputs.agent-image-py2 }}"
198-
agent-image-windows: "${{ inputs.agent-image-windows }}"
199-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
200-
test-py2: ${{ inputs.test-py2 }}
201-
test-py3: ${{ inputs.test-py3 }}
202-
minimum-base-package: ${{ inputs.minimum-base-package }}
203-
secrets: inherit
20452
jd66e148:
20553
uses: ./.github/workflows/test-target.yml
20654
with:

0 commit comments

Comments
 (0)