Skip to content

Commit 92851be

Browse files
asdf
1 parent 48db2dd commit 92851be

File tree

6 files changed

+35
-20
lines changed

6 files changed

+35
-20
lines changed

.evergreen/config.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4874,6 +4874,14 @@ buildvariants:
48744874
- run-custom-csfle-tests-rapid
48754875
- run-custom-csfle-tests-latest
48764876
- test-latest-driver-mongodb-client-encryption-6.0.0
4877+
- name: rhel8-test-serverless
4878+
display_name: Serverless Test
4879+
run_on: rhel80-large
4880+
expansions:
4881+
NODE_LTS_VERSION: 16
4882+
NPM_VERSION: 9
4883+
tasks:
4884+
- serverless_task_group
48774885
- name: rhel8-test-gcp-kms
48784886
display_name: GCP KMS Test
48794887
run_on: debian11-small
@@ -4955,6 +4963,6 @@ buildvariants:
49554963
- .resource-management
49564964
- name: alpine FLE test
49574965
display_name: alpine FLE test
4958-
run_on: ubuntu2204-large
4966+
run_on: ubuntu2204-small
49594967
tasks:
49604968
- .alpine-fle

.evergreen/docker/Dockerfile.musl

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,24 @@ FROM ${ARCH}/node:${NODE_VERSION}-alpine AS dependencies
55

66
RUN apk --no-cache add make g++ libc-dev curl bash python3 py3-pip cmake git vim ranger
77

8-
RUN python3 --version
9-
RUN git --version
10-
RUN c++ --version
11-
RUN g++ --version
8+
RUN <<EOF
9+
python3 --version
10+
git --version
11+
c++ --version
12+
g++ --version
13+
EOF
1214

1315
ARG DRIVERS_TOOLS=drivers-evergreen-tools
1416
WORKDIR ${DRIVERS_TOOLS}
1517
RUN git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git .
1618

17-
RUN git clone https://github.com/baileympearson/mongodb-client-encryption.git && cd mongodb-client-encryption && git switch alpine && npm run install:libmongocrypt
19+
WORKDIR /mongodb-client-encryption
20+
RUN <<EOF
21+
git clone https://github.com/baileympearson/mongodb-client-encryption.git .
22+
cd mongodb-client-encryption
23+
git switch alpine
24+
npm run install:libmongocrypt
25+
EOF
1826

1927
WORKDIR /node-mongodb-native
2028
COPY . .

.evergreen/generate_evergreen_tasks.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -808,16 +808,16 @@ BUILD_VARIANTS.push({
808808

809809
// TODO(NODE-6748): unskip serverless tests when getParameter and failPoints are possible
810810
// special case for serverless testing
811-
// BUILD_VARIANTS.push({
812-
// name: 'rhel8-test-serverless',
813-
// display_name: 'Serverless Test',
814-
// run_on: DEFAULT_OS,
815-
// expansions: {
816-
// NODE_LTS_VERSION: LOWEST_LTS,
817-
// NPM_VERSION: 9
818-
// },
819-
// tasks: ['serverless_task_group']
820-
// });
811+
BUILD_VARIANTS.push({
812+
name: 'rhel8-test-serverless',
813+
display_name: 'Serverless Test',
814+
run_on: DEFAULT_OS,
815+
expansions: {
816+
NODE_LTS_VERSION: LOWEST_LTS,
817+
NPM_VERSION: 9
818+
},
819+
tasks: ['serverless_task_group']
820+
});
821821

822822
BUILD_VARIANTS.push({
823823
name: 'rhel8-test-gcp-kms',
@@ -893,7 +893,7 @@ BUILD_VARIANTS.push({
893893
BUILD_VARIANTS.push({
894894
name: 'alpine FLE test',
895895
display_name: 'alpine FLE test',
896-
run_on: UBUNTU_22_OS,
896+
run_on: 'ubuntu2204-small',
897897
tasks: ['.alpine-fle']
898898
});
899899

test/integration/client-side-encryption/client_side_encryption.spec.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const isServerless = !!process.env.SERVERLESS;
6262

6363
const filter = new ClientSideEncryptionFilter();
6464

65-
describe.only('Client Side Encryption (Legacy)', function () {
65+
describe('Client Side Encryption (Legacy)', function () {
6666
const testContext = new TestRunnerContext({ requiresCSFLE: true });
6767
const testSuites = gatherTestSuites(
6868
path.join(__dirname, '../../spec/client-side-encryption/tests/legacy'),

test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const skippedTests = {
2121
'timeoutMS is refreshed for getMore if maxAwaitTimeMS is set': 'TODO(DRIVERS-3018)'
2222
};
2323

24-
describe.only('CSOT spec tests', function () {
24+
describe('CSOT spec tests', function () {
2525
const specs = loadSpecTests('client-side-operations-timeout');
2626
for (const spec of specs) {
2727
for (const test of spec.tests) {

test/tools/runner/config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ export class TestConfiguration {
297297

298298
const connectionString = url.format(urlOptions);
299299

300-
console.error({ connectionString })
301300
return new MongoClient(connectionString, serverOptions);
302301
}
303302

0 commit comments

Comments
 (0)