Skip to content

Commit 33acc2a

Browse files
ooo hahaha
1 parent 8ac3ed1 commit 33acc2a

File tree

4 files changed

+66
-4
lines changed

4 files changed

+66
-4
lines changed

.evergreen/config.in.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,18 @@ functions:
365365
args:
366366
- "${PROJECT_DIRECTORY}/.evergreen/run-resource-management.sh"
367367

368+
"check resource management smoke tests":
369+
- command: subprocess.exec
370+
type: test
371+
params:
372+
working_dir: "src"
373+
timeout_secs: 60
374+
env:
375+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
376+
binary: bash
377+
args:
378+
- "${PROJECT_DIRECTORY}/.evergreen/run-resource-management-smoke-tests.sh"
379+
368380
"compile driver":
369381
- command: subprocess.exec
370382
type: test

.evergreen/config.yml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,17 @@ functions:
327327
binary: bash
328328
args:
329329
- ${PROJECT_DIRECTORY}/.evergreen/run-resource-management.sh
330+
check resource management smoke tests:
331+
- command: subprocess.exec
332+
type: test
333+
params:
334+
working_dir: src
335+
timeout_secs: 60
336+
env:
337+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
338+
binary: bash
339+
args:
340+
- ${PROJECT_DIRECTORY}/.evergreen/run-resource-management-smoke-tests.sh
330341
compile driver:
331342
- command: subprocess.exec
332343
type: test
@@ -3496,6 +3507,20 @@ tasks:
34963507
- {key: NPM_VERSION, value: '9'}
34973508
- func: install dependencies
34983509
- func: check resource management
3510+
- name: test-explicit-resource-management-smoke-tests
3511+
tags:
3512+
- resource-management
3513+
commands:
3514+
- command: expansions.update
3515+
type: setup
3516+
params:
3517+
updates:
3518+
- {key: VERSION, value: latest}
3519+
- {key: TOPOLOGY, value: replica_set}
3520+
- {key: NODE_LTS_VERSION, value: latest}
3521+
- func: install dependencies
3522+
- func: bootstrap mongo-orchestration
3523+
- func: check resource management smoke tests
34993524
- name: check-types-typescript-next-node-types-20.14.10
35003525
tags:
35013526
- check-types-typescript-next
@@ -5055,7 +5080,6 @@ buildvariants:
50555080
- .unit-tests
50565081
- .lint-checks
50575082
- .typescript-compilation
5058-
- .resource-management
50595083
- name: generate-combined-coverage
50605084
display_name: Generate Combined Coverage
50615085
run_on: rhel80-large
@@ -5258,3 +5282,8 @@ buildvariants:
52585282
run_on: rhel80-large
52595283
tasks:
52605284
- test_atlas_task_group_search_indexes
5285+
- name: resource management tests
5286+
display_name: resource management tests
5287+
run_on: rhel80-large
5288+
tasks:
5289+
- .resource-management

.evergreen/generate_evergreen_tasks.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,20 @@ SINGLETON_TASKS.push(
516516
{ func: 'check resource management' }
517517
]
518518
},
519+
{
520+
name: 'test-explicit-resource-management-smoke-tests',
521+
tags: ['resource-management'],
522+
commands: [
523+
updateExpansions({
524+
VERSION: 'latest',
525+
TOPOLOGY: 'replica_set',
526+
NODE_LTS_VERSION: 'latest'
527+
}),
528+
{ func: 'install dependencies' },
529+
{ func: 'bootstrap mongo-orchestration' },
530+
{ func: 'check resource management smoke tests' }
531+
]
532+
},
519533
...Array.from(makeTypescriptTasks())
520534
]
521535
);
@@ -572,7 +586,7 @@ BUILD_VARIANTS.push({
572586
name: 'lint',
573587
display_name: 'lint',
574588
run_on: DEFAULT_OS,
575-
tasks: ['.unit-tests', '.lint-checks', '.typescript-compilation', '.resource-management']
589+
tasks: ['.unit-tests', '.lint-checks', '.typescript-compilation']
576590
});
577591

578592
BUILD_VARIANTS.push({
@@ -755,6 +769,13 @@ BUILD_VARIANTS.push({
755769
tasks: ['test_atlas_task_group_search_indexes']
756770
});
757771

772+
BUILD_VARIANTS.push({
773+
name: 'resource management tests',
774+
display_name: 'resource management tests',
775+
run_on: DEFAULT_OS,
776+
tasks: ['.resource-management']
777+
});
778+
758779
// TODO(NODE-4575): unskip zstd and snappy on node 16
759780
for (const variant of BUILD_VARIANTS.filter(
760781
variant => variant.expansions && [16, 18, 20].includes(variant.expansions.NODE_LTS_VERSION)

.evergreen/run-resource-management-smoke-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#! /bin/bash
22

3-
# source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
3+
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
44

55
echo "Building driver..."
6-
npm run build:dts
6+
npm pack
77
echo "Building driver...finished."
88

99
echo "Node version: $(node -v)"

0 commit comments

Comments
 (0)