Skip to content

Commit e96271d

Browse files
rochdevrochdev
authored
ci: move serverless owned ci jobs to serverless workflow (#6226)
1 parent 1f26dcb commit e96271d

File tree

8 files changed

+178
-178
lines changed

8 files changed

+178
-178
lines changed

‎.github/workflows/apm-integrations.yml

Lines changed: 0 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -121,65 +121,6 @@ jobs:
121121
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
122122
- uses: ./.github/actions/plugins/test-and-upstream
123123

124-
aws-sdk:
125-
strategy:
126-
matrix:
127-
include:
128-
- node-version: latest
129-
node-opts: --no-async-context-frame
130-
- node-version: oldest
131-
node-opts: ''
132-
runs-on: ubuntu-latest
133-
services:
134-
localstack:
135-
image: localstack/localstack:3.0.2
136-
env:
137-
LOCALSTACK_SERVICES: dynamodb,kinesis,s3,sqs,sns,redshift,route53,logs,serverless,lambda,stepfunctions,events
138-
EXTRA_CORS_ALLOWED_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
139-
EXTRA_CORS_EXPOSE_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
140-
AWS_DEFAULT_REGION: us-east-1
141-
FORCE_NONINTERACTIVE: 'true'
142-
LAMBDA_EXECUTOR: local
143-
START_WEB: '0'
144-
ports:
145-
- 4566:4566
146-
# we have two localstacks since upgrading localstack was causing lambda & S3 tests to fail
147-
# To-Do: Debug localstack / lambda and localstack / S3
148-
localstack-legacy:
149-
image: localstack/localstack:1.1.0
150-
ports:
151-
- "127.0.0.1:4567:4567" # Edge
152-
env:
153-
LOCALSTACK_SERVICES: dynamodb,kinesis,s3,sqs,sns,redshift,route53,logs,serverless
154-
EXTRA_CORS_ALLOWED_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
155-
EXTRA_CORS_EXPOSE_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
156-
AWS_DEFAULT_REGION: us-east-1
157-
FORCE_NONINTERACTIVE: 'true'
158-
LAMBDA_EXECUTOR: local
159-
START_WEB: '0'
160-
GATEWAY_LISTEN: 127.0.0.1:4567
161-
EDGE_PORT: 4567
162-
EDGE_PORT_HTTP: 4567
163-
env:
164-
PLUGINS: aws-sdk
165-
SERVICES: localstack localstack-legacy
166-
DD_DATA_STREAMS_ENABLED: true
167-
steps:
168-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
169-
- uses: ./.github/actions/testagent/start
170-
- uses: ./.github/actions/node
171-
with:
172-
version: ${{ matrix.node-version }}
173-
- uses: ./.github/actions/install
174-
- run: yarn test:plugins:ci
175-
env:
176-
NODE_OPTIONS: ${{ matrix.node-opts }}
177-
- if: always()
178-
uses: ./.github/actions/testagent/logs
179-
with:
180-
suffix: plugins-${{ github.job }}-${{ matrix.node-version }}
181-
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
182-
183124
axios:
184125
runs-on: ubuntu-latest
185126
env:
@@ -188,58 +129,6 @@ jobs:
188129
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
189130
- uses: ./.github/actions/plugins/upstream
190131

191-
azure-functions:
192-
runs-on: ubuntu-latest
193-
services:
194-
azureservicebusemulator:
195-
image: mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
196-
ports:
197-
- "127.0.0.1:5672:5672"
198-
- "127.0.0.1:5300:5300"
199-
env:
200-
ACCEPT_EULA: "Y"
201-
MSSQL_SA_PASSWORD: "Localtestpass1!"
202-
SQL_SERVER: azuresqledge
203-
azuresqledge:
204-
image: mcr.microsoft.com/azure-sql-edge:1.0.7
205-
ports:
206-
- "127.0.0.1:1433:1433"
207-
env:
208-
ACCEPT_EULA: "Y"
209-
MSSQL_SA_PASSWORD: "Localtestpass1!"
210-
env:
211-
PLUGINS: azure-functions
212-
SERVICES: azureservicebusemulator,azuresqledge
213-
steps:
214-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
215-
- uses: ./.github/actions/plugins/test
216-
217-
azure-service-bus:
218-
runs-on: ubuntu-latest
219-
services:
220-
azureservicebusemulator:
221-
image: mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
222-
ports:
223-
- "127.0.0.1:5672:5672"
224-
- "127.0.0.1:5300:5300"
225-
env:
226-
ACCEPT_EULA: "Y"
227-
MSSQL_SA_PASSWORD: "Localtestpass1!"
228-
SQL_SERVER: azuresqledge
229-
azuresqledge:
230-
image: mcr.microsoft.com/azure-sql-edge:1.0.7
231-
ports:
232-
- "127.0.0.1:1433:1433"
233-
env:
234-
ACCEPT_EULA: "Y"
235-
MSSQL_SA_PASSWORD: "Localtestpass1!"
236-
env:
237-
PLUGINS: azure-service-bus
238-
SERVICES: azureservicebusemulator,azuresqledge
239-
steps:
240-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
241-
- uses: ./.github/actions/plugins/test
242-
243132
bunyan:
244133
runs-on: ubuntu-latest
245134
env:
@@ -361,14 +250,6 @@ jobs:
361250
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
362251
- uses: ./.github/actions/plugins/test-and-upstream
363252

364-
dd-trace-api:
365-
runs-on: ubuntu-latest
366-
env:
367-
PLUGINS: dd-trace-api
368-
steps:
369-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
370-
- uses: ./.github/actions/plugins/test
371-
372253
dns:
373254
runs-on: ubuntu-latest
374255
env:
@@ -447,20 +328,6 @@ jobs:
447328
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
448329
- uses: ./.github/actions/plugins/test
449330

450-
google-cloud-pubsub:
451-
runs-on: ubuntu-latest
452-
services:
453-
pubsub:
454-
image: ghcr.io/ridedott/pubsub-emulator
455-
ports:
456-
- 8081:8081
457-
env:
458-
PLUGINS: google-cloud-pubsub
459-
SERVICES: gpubsub
460-
steps:
461-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
462-
- uses: ./.github/actions/plugins/test
463-
464331
graphql:
465332
runs-on: ubuntu-latest
466333
env:

‎.github/workflows/lambda.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎.github/workflows/platform.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ jobs:
2828
- run: yarn test:core:ci
2929
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
3030

31+
dd-trace-api:
32+
runs-on: ubuntu-latest
33+
env:
34+
PLUGINS: dd-trace-api
35+
steps:
36+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
- uses: ./.github/actions/plugins/test
38+
3139
instrumentation-bluebird:
3240
runs-on: ubuntu-latest
3341
env:

‎.github/workflows/retry.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ on:
1414
- APM Integrations
1515
- AppSec
1616
- Debugger
17-
- Lambda
1817
- LLMObs
1918
- Platform
2019
- Profiling
2120
- Project
21+
- Serverless
2222
- System Tests
2323
- Test Optimization
2424

‎.github/workflows/serverless.yml

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
name: Serverless
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [master]
7+
schedule:
8+
- cron: 0 4 * * *
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
12+
cancel-in-progress: true
13+
14+
env:
15+
MOCHA_OPTIONS: ${{ github.ref == 'refs/heads/master' && '--retries 1' || '' }}
16+
17+
jobs:
18+
lambda:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
- uses: ./.github/actions/testagent/start
23+
- uses: ./.github/actions/node/oldest-maintenance-lts
24+
- uses: ./.github/actions/install
25+
- run: yarn test:lambda:ci
26+
- uses: ./.github/actions/node/newest-maintenance-lts
27+
- run: yarn test:lambda:ci
28+
- uses: ./.github/actions/node/active-lts
29+
- run: yarn test:lambda:ci
30+
- uses: ./.github/actions/node/latest
31+
- run: yarn test:lambda:ci
32+
- if: always()
33+
uses: ./.github/actions/testagent/logs
34+
with:
35+
suffix: lambda
36+
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
37+
38+
aws-sdk:
39+
strategy:
40+
matrix:
41+
include:
42+
- node-version: latest
43+
node-opts: --no-async-context-frame
44+
- node-version: oldest
45+
node-opts: ''
46+
runs-on: ubuntu-latest
47+
services:
48+
localstack:
49+
image: localstack/localstack:3.0.2
50+
env:
51+
LOCALSTACK_SERVICES: dynamodb,kinesis,s3,sqs,sns,redshift,route53,logs,serverless,lambda,stepfunctions,events
52+
EXTRA_CORS_ALLOWED_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
53+
EXTRA_CORS_EXPOSE_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
54+
AWS_DEFAULT_REGION: us-east-1
55+
FORCE_NONINTERACTIVE: 'true'
56+
LAMBDA_EXECUTOR: local
57+
START_WEB: '0'
58+
ports:
59+
- 4566:4566
60+
# we have two localstacks since upgrading localstack was causing lambda & S3 tests to fail
61+
# To-Do: Debug localstack / lambda and localstack / S3
62+
localstack-legacy:
63+
image: localstack/localstack:1.1.0
64+
ports:
65+
- "127.0.0.1:4567:4567" # Edge
66+
env:
67+
LOCALSTACK_SERVICES: dynamodb,kinesis,s3,sqs,sns,redshift,route53,logs,serverless
68+
EXTRA_CORS_ALLOWED_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
69+
EXTRA_CORS_EXPOSE_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
70+
AWS_DEFAULT_REGION: us-east-1
71+
FORCE_NONINTERACTIVE: 'true'
72+
LAMBDA_EXECUTOR: local
73+
START_WEB: '0'
74+
GATEWAY_LISTEN: 127.0.0.1:4567
75+
EDGE_PORT: 4567
76+
EDGE_PORT_HTTP: 4567
77+
env:
78+
PLUGINS: aws-sdk
79+
SERVICES: localstack localstack-legacy
80+
DD_DATA_STREAMS_ENABLED: true
81+
steps:
82+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
83+
- uses: ./.github/actions/testagent/start
84+
- uses: ./.github/actions/node
85+
with:
86+
version: ${{ matrix.node-version }}
87+
- uses: ./.github/actions/install
88+
- run: yarn test:plugins:ci
89+
env:
90+
NODE_OPTIONS: ${{ matrix.node-opts }}
91+
- if: always()
92+
uses: ./.github/actions/testagent/logs
93+
with:
94+
suffix: plugins-${{ github.job }}-${{ matrix.node-version }}
95+
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
96+
97+
azure-functions:
98+
runs-on: ubuntu-latest
99+
services:
100+
azureservicebusemulator:
101+
image: mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
102+
ports:
103+
- "127.0.0.1:5672:5672"
104+
- "127.0.0.1:5300:5300"
105+
env:
106+
ACCEPT_EULA: "Y"
107+
MSSQL_SA_PASSWORD: "Localtestpass1!"
108+
SQL_SERVER: azuresqledge
109+
azuresqledge:
110+
image: mcr.microsoft.com/azure-sql-edge:1.0.7
111+
ports:
112+
- "127.0.0.1:1433:1433"
113+
env:
114+
ACCEPT_EULA: "Y"
115+
MSSQL_SA_PASSWORD: "Localtestpass1!"
116+
env:
117+
PLUGINS: azure-functions
118+
SERVICES: azureservicebusemulator,azuresqledge
119+
steps:
120+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
121+
- uses: ./.github/actions/plugins/test
122+
123+
azure-service-bus:
124+
runs-on: ubuntu-latest
125+
services:
126+
azureservicebusemulator:
127+
image: mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
128+
ports:
129+
- "127.0.0.1:5672:5672"
130+
- "127.0.0.1:5300:5300"
131+
env:
132+
ACCEPT_EULA: "Y"
133+
MSSQL_SA_PASSWORD: "Localtestpass1!"
134+
SQL_SERVER: azuresqledge
135+
azuresqledge:
136+
image: mcr.microsoft.com/azure-sql-edge:1.0.7
137+
ports:
138+
- "127.0.0.1:1433:1433"
139+
env:
140+
ACCEPT_EULA: "Y"
141+
MSSQL_SA_PASSWORD: "Localtestpass1!"
142+
env:
143+
PLUGINS: azure-service-bus
144+
SERVICES: azureservicebusemulator,azuresqledge
145+
steps:
146+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
147+
- uses: ./.github/actions/plugins/test
148+
149+
google-cloud-pubsub:
150+
runs-on: ubuntu-latest
151+
services:
152+
pubsub:
153+
image: ghcr.io/ridedott/pubsub-emulator
154+
ports:
155+
- 8081:8081
156+
env:
157+
PLUGINS: google-cloud-pubsub
158+
SERVICES: gpubsub
159+
steps:
160+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
161+
- uses: ./.github/actions/plugins/test

‎CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
/.github/workflows/appsec.yml @DataDog/asm-js
9595
/.github/workflows/codeql-analysis.yml @DataDog/dd-trace-js
9696
/.github/workflows/debugger.yml @DataDog/debugger
97-
/.github/workflows/lambda.yml @DataDog/serverless-aws
97+
/.github/workflows/serverless.yml @DataDog/serverless-aws
9898
/.github/workflows/llmobs.yml @DataDog/ml-observability
9999
/.github/workflows/platform.yml @DataDog/dd-trace-js
100100
/.github/workflows/pr-labels.yml @DataDog/dd-trace-js

0 commit comments

Comments
 (0)