Skip to content

Commit e5bb354

Browse files
alexeypilyuginalexeypilyugin
committed
Remove py2-windows
1 parent f1ac17d commit e5bb354

File tree

9 files changed

+9
-260
lines changed

9 files changed

+9
-260
lines changed

‎.github/workflows/test-agent-windows.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ on:
2828
description: Agent 6 image
2929
default: "registry.datadoghq.com/agent:6-rc"
3030
type: string
31-
agent-image-windows-py2:
32-
required: false
33-
description: Agent 6 image on Windows
34-
default: "datadog/agent-dev:master-py2-win-servercore"
35-
type: string
3631

3732
jobs:
3833
test:
@@ -46,7 +41,6 @@ jobs:
4641
agent-image: "${{ inputs.agent-image }}"
4742
agent-image-py2: "${{ inputs.agent-image-py2 }}"
4843
agent-image-windows: "${{ inputs.agent-image-windows }}"
49-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
5044
skip-ddev-tests: true
5145
context: "test-agent"
5246
secrets: inherit

‎.github/workflows/test-agent.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ on:
2828
description: Agent 6 image
2929
default: "registry.datadoghq.com/agent:6-rc"
3030
type: string
31-
agent-image-windows-py2:
32-
required: false
33-
description: Agent 6 image on Windows
34-
default: "datadog/agent-dev:master-py2-win-servercore" # todo: support registry.datadoghq.com
35-
type: string
3631

3732
jobs:
3833
test:
@@ -46,7 +41,6 @@ jobs:
4641
agent-image: "${{ inputs.agent-image }}"
4742
agent-image-py2: "${{ inputs.agent-image-py2 }}"
4843
agent-image-windows: "${{ inputs.agent-image-windows }}"
49-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
5044
skip-ddev-tests: true
5145
context: "test-agent"
5246
secrets: inherit

‎.github/workflows/test-all-windows.yml‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,11 @@ on:
3939
type: string
4040
agent-image-py2:
4141
required: false
42-
default: "datadog/agent-dev:master-py2" # todo: support registry.datadoghq.com
42+
default: "registry.datadoghq.com/agent:6-rc"
4343
type: string
4444
agent-image-windows:
4545
required: false
46-
default: "datadog/agent-dev:master-py3-win-servercore" # todo: support registry.datadoghq.com
47-
type: string
48-
agent-image-windows-py2:
49-
required: false
50-
default: "datadog/agent-dev:master-py2-win-servercore" # todo: support registry.datadoghq.com
46+
default: "registry.datadoghq.com/agent:latest-servercore"
5147
type: string
5248
pytest-args:
5349
description: "Arguments to pass to pytest"
@@ -78,7 +74,6 @@ jobs:
7874
agent-image: "${{ inputs.agent-image }}"
7975
agent-image-py2: "${{ inputs.agent-image-py2 }}"
8076
agent-image-windows: "${{ inputs.agent-image-windows }}"
81-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
8277
test-py2: ${{ inputs.test-py2 }}
8378
test-py3: ${{ inputs.test-py3 }}
8479
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -99,7 +94,6 @@ jobs:
9994
agent-image: "${{ inputs.agent-image }}"
10095
agent-image-py2: "${{ inputs.agent-image-py2 }}"
10196
agent-image-windows: "${{ inputs.agent-image-windows }}"
102-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
10397
test-py2: ${{ inputs.test-py2 }}
10498
test-py3: ${{ inputs.test-py3 }}
10599
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -119,7 +113,6 @@ jobs:
119113
agent-image: "${{ inputs.agent-image }}"
120114
agent-image-py2: "${{ inputs.agent-image-py2 }}"
121115
agent-image-windows: "${{ inputs.agent-image-windows }}"
122-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
123116
test-py2: ${{ inputs.test-py2 }}
124117
test-py3: ${{ inputs.test-py3 }}
125118
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -139,7 +132,6 @@ jobs:
139132
agent-image: "${{ inputs.agent-image }}"
140133
agent-image-py2: "${{ inputs.agent-image-py2 }}"
141134
agent-image-windows: "${{ inputs.agent-image-windows }}"
142-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
143135
test-py2: ${{ inputs.test-py2 }}
144136
test-py3: ${{ inputs.test-py3 }}
145137
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -159,7 +151,6 @@ jobs:
159151
agent-image: "${{ inputs.agent-image }}"
160152
agent-image-py2: "${{ inputs.agent-image-py2 }}"
161153
agent-image-windows: "${{ inputs.agent-image-windows }}"
162-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
163154
test-py2: ${{ inputs.test-py2 }}
164155
test-py3: ${{ inputs.test-py3 }}
165156
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -179,7 +170,6 @@ jobs:
179170
agent-image: "${{ inputs.agent-image }}"
180171
agent-image-py2: "${{ inputs.agent-image-py2 }}"
181172
agent-image-windows: "${{ inputs.agent-image-windows }}"
182-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
183173
test-py2: ${{ inputs.test-py2 }}
184174
test-py3: ${{ inputs.test-py3 }}
185175
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -199,7 +189,6 @@ jobs:
199189
agent-image: "${{ inputs.agent-image }}"
200190
agent-image-py2: "${{ inputs.agent-image-py2 }}"
201191
agent-image-windows: "${{ inputs.agent-image-windows }}"
202-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
203192
test-py2: ${{ inputs.test-py2 }}
204193
test-py3: ${{ inputs.test-py3 }}
205194
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -219,7 +208,6 @@ jobs:
219208
agent-image: "${{ inputs.agent-image }}"
220209
agent-image-py2: "${{ inputs.agent-image-py2 }}"
221210
agent-image-windows: "${{ inputs.agent-image-windows }}"
222-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
223211
test-py2: ${{ inputs.test-py2 }}
224212
test-py3: ${{ inputs.test-py3 }}
225213
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -239,7 +227,6 @@ jobs:
239227
agent-image: "${{ inputs.agent-image }}"
240228
agent-image-py2: "${{ inputs.agent-image-py2 }}"
241229
agent-image-windows: "${{ inputs.agent-image-windows }}"
242-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
243230
test-py2: ${{ inputs.test-py2 }}
244231
test-py3: ${{ inputs.test-py3 }}
245232
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -259,7 +246,6 @@ jobs:
259246
agent-image: "${{ inputs.agent-image }}"
260247
agent-image-py2: "${{ inputs.agent-image-py2 }}"
261248
agent-image-windows: "${{ inputs.agent-image-windows }}"
262-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
263249
test-py2: ${{ inputs.test-py2 }}
264250
test-py3: ${{ inputs.test-py3 }}
265251
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -279,7 +265,6 @@ jobs:
279265
agent-image: "${{ inputs.agent-image }}"
280266
agent-image-py2: "${{ inputs.agent-image-py2 }}"
281267
agent-image-windows: "${{ inputs.agent-image-windows }}"
282-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
283268
test-py2: ${{ inputs.test-py2 }}
284269
test-py3: ${{ inputs.test-py3 }}
285270
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -299,7 +284,6 @@ jobs:
299284
agent-image: "${{ inputs.agent-image }}"
300285
agent-image-py2: "${{ inputs.agent-image-py2 }}"
301286
agent-image-windows: "${{ inputs.agent-image-windows }}"
302-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
303287
test-py2: ${{ inputs.test-py2 }}
304288
test-py3: ${{ inputs.test-py3 }}
305289
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -319,7 +303,6 @@ jobs:
319303
agent-image: "${{ inputs.agent-image }}"
320304
agent-image-py2: "${{ inputs.agent-image-py2 }}"
321305
agent-image-windows: "${{ inputs.agent-image-windows }}"
322-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
323306
test-py2: ${{ inputs.test-py2 }}
324307
test-py3: ${{ inputs.test-py3 }}
325308
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -339,7 +322,6 @@ jobs:
339322
agent-image: "${{ inputs.agent-image }}"
340323
agent-image-py2: "${{ inputs.agent-image-py2 }}"
341324
agent-image-windows: "${{ inputs.agent-image-windows }}"
342-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
343325
test-py2: ${{ inputs.test-py2 }}
344326
test-py3: ${{ inputs.test-py3 }}
345327
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -359,7 +341,6 @@ jobs:
359341
agent-image: "${{ inputs.agent-image }}"
360342
agent-image-py2: "${{ inputs.agent-image-py2 }}"
361343
agent-image-windows: "${{ inputs.agent-image-windows }}"
362-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
363344
test-py2: ${{ inputs.test-py2 }}
364345
test-py3: ${{ inputs.test-py3 }}
365346
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -379,7 +360,6 @@ jobs:
379360
agent-image: "${{ inputs.agent-image }}"
380361
agent-image-py2: "${{ inputs.agent-image-py2 }}"
381362
agent-image-windows: "${{ inputs.agent-image-windows }}"
382-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
383363
test-py2: ${{ inputs.test-py2 }}
384364
test-py3: ${{ inputs.test-py3 }}
385365
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -399,7 +379,6 @@ jobs:
399379
agent-image: "${{ inputs.agent-image }}"
400380
agent-image-py2: "${{ inputs.agent-image-py2 }}"
401381
agent-image-windows: "${{ inputs.agent-image-windows }}"
402-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
403382
test-py2: ${{ inputs.test-py2 }}
404383
test-py3: ${{ inputs.test-py3 }}
405384
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -419,7 +398,6 @@ jobs:
419398
agent-image: "${{ inputs.agent-image }}"
420399
agent-image-py2: "${{ inputs.agent-image-py2 }}"
421400
agent-image-windows: "${{ inputs.agent-image-windows }}"
422-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
423401
test-py2: ${{ inputs.test-py2 }}
424402
test-py3: ${{ inputs.test-py3 }}
425403
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -439,7 +417,6 @@ jobs:
439417
agent-image: "${{ inputs.agent-image }}"
440418
agent-image-py2: "${{ inputs.agent-image-py2 }}"
441419
agent-image-windows: "${{ inputs.agent-image-windows }}"
442-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
443420
test-py2: ${{ inputs.test-py2 }}
444421
test-py3: ${{ inputs.test-py3 }}
445422
minimum-base-package: ${{ inputs.minimum-base-package }}
@@ -459,7 +436,6 @@ jobs:
459436
agent-image: "${{ inputs.agent-image }}"
460437
agent-image-py2: "${{ inputs.agent-image-py2 }}"
461438
agent-image-windows: "${{ inputs.agent-image-windows }}"
462-
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
463439
test-py2: ${{ inputs.test-py2 }}
464440
test-py3: ${{ inputs.test-py3 }}
465441
minimum-base-package: ${{ inputs.minimum-base-package }}

0 commit comments

Comments
 (0)