Skip to content

Commit b8246ab

Browse files
qwas;ldkjf;?
1 parent 7ff5db9 commit b8246ab

File tree

4 files changed

+53
-46
lines changed

4 files changed

+53
-46
lines changed

.evergreen/config.in.yml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -743,9 +743,11 @@ functions:
743743
INSTALL_DIR: mongodb-client-encryption
744744
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
745745
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
746+
NODE_VERSION: ${NODE_VERSION}
747+
MONGODB_URI: ${MONGODB_URI}
746748
binary: bash
747749
args:
748-
- .evergreen/docker/apline.sh
750+
- .evergreen/docker/alpine.sh
749751

750752
tasks:
751753
- name: 'test-atlas-data-lake'
@@ -1008,26 +1010,6 @@ tasks:
10081010
args:
10091011
- .evergreen/run-search-index-management-tests.sh
10101012

1011-
- name: test-alpine-fle
1012-
tags:
1013-
- alpine-fle
1014-
commands:
1015-
- command: expansions.update
1016-
type: setup
1017-
params:
1018-
updates:
1019-
- {key: VERSION, value: latest}
1020-
- {key: TOPOLOGY, value: replica_set}
1021-
- {key: AUTH, value: auth}
1022-
- {key: CLIENT_ENCRYPTION, value: 'true'}
1023-
- {key: TEST_CSFLE, value: 'true'}
1024-
- {key: MONGODB_BINARIES, value: '${PROJECT_DIRECTORY}/mongodb/bin'}
1025-
- func: install dependencies
1026-
- func: bootstrap mongo-orchestration
1027-
- func: bootstrap kms servers
1028-
- func: assume secrets manager rule
1029-
- func: build and test alpine FLE
1030-
10311013
task_groups:
10321014
- name: serverless_task_group
10331015
setup_group_can_fail_task: true

.evergreen/config.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,11 @@ functions:
666666
INSTALL_DIR: mongodb-client-encryption
667667
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
668668
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
669+
NODE_VERSION: ${NODE_VERSION}
670+
MONGODB_URI: ${MONGODB_URI}
669671
binary: bash
670672
args:
671-
- .evergreen/docker/apline.sh
673+
- .evergreen/docker/alpine.sh
672674
tasks:
673675
- name: test-atlas-data-lake
674676
tags:
@@ -925,25 +927,6 @@ tasks:
925927
add_expansions_to_env: true
926928
args:
927929
- .evergreen/run-search-index-management-tests.sh
928-
- name: test-alpine-fle
929-
tags:
930-
- alpine-fle
931-
commands:
932-
- command: expansions.update
933-
type: setup
934-
params:
935-
updates:
936-
- {key: VERSION, value: latest}
937-
- {key: TOPOLOGY, value: replica_set}
938-
- {key: AUTH, value: auth}
939-
- {key: CLIENT_ENCRYPTION, value: 'true'}
940-
- {key: TEST_CSFLE, value: 'true'}
941-
- {key: MONGODB_BINARIES, value: '${PROJECT_DIRECTORY}/mongodb/bin'}
942-
- func: install dependencies
943-
- func: bootstrap mongo-orchestration
944-
- func: bootstrap kms servers
945-
- func: assume secrets manager rule
946-
- func: build and test alpine FLE
947930
- name: test-latest-server
948931
tags:
949932
- latest
@@ -3311,6 +3294,25 @@ tasks:
33113294
vars:
33123295
PACKAGE: mongodb-client-encryption@6.0.0
33133296
- func: run tests
3297+
- name: test-alpine-fle
3298+
tags:
3299+
- alpine-fle
3300+
commands:
3301+
- command: expansions.update
3302+
type: setup
3303+
params:
3304+
updates:
3305+
- {key: NODE_VERSION, value: 16.20.1}
3306+
- {key: VERSION, value: latest}
3307+
- {key: TOPOLOGY, value: replica_set}
3308+
- {key: CLIENT_ENCRYPTION, value: 'true'}
3309+
- {key: TEST_CSFLE, value: 'true'}
3310+
- {key: MONGODB_BINARIES, value: '${PROJECT_DIRECTORY}/mongodb/bin'}
3311+
- func: install dependencies
3312+
- func: bootstrap mongo-orchestration
3313+
- func: bootstrap kms servers
3314+
- func: assume secrets manager rule
3315+
- func: build and test alpine FLE
33143316
- name: test-latest-server-noauth
33153317
tags:
33163318
- latest

.evergreen/docker/alpine.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
# script to aid in local testing of linux platforms
44
# requires a running docker instance
55

6-
# ubuntu2204 hosts in ci use amd64
7-
LINUX_ARCH=amd64
6+
if [ -z ${NODE_VERSION+omitted} ]; then echo "NODE_VERSION is unset" && exit 1; fi
7+
if [ -z ${DRIVERS_TOOLS+omitted} ]; then echo "DRIVERS_TOOLS is unset" && exit 1; fi
8+
if [ -z ${MONGODB_URI+omitted} ]; then echo "MONGODB_URI is unset" && exit 1; fi
89

9-
# 16.20.1+, default 16.20.1
10-
NODE_VERSION=20.0.0
10+
# ubuntu2204 hosts in ci use amd64
11+
LINUX_ARCH=${LINUX_ARCH:-amd64}
1112

12-
IMAGE_TAG=alpine-fle-image
13+
IMAGE_TAG=${IMAGE_TAG:-alpine-fle-image}
1314

1415
build_alpine() {
1516
docker buildx create --name builder --bootstrap --use

.evergreen/generate_evergreen_tasks.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,28 @@ const coverageTask = {
729729
SINGLETON_TASKS.push(coverageTask);
730730
SINGLETON_TASKS.push(...customDependencyTests);
731731

732+
SINGLETON_TASKS.push(
733+
{
734+
name: `test-alpine-fle`,
735+
tags: ['alpine-fle'],
736+
commands: [
737+
updateExpansions({
738+
NODE_VERSION: '16.20.1',
739+
VERSION: 'latest',
740+
TOPOLOGY: 'replica_set',
741+
CLIENT_ENCRYPTION: true,
742+
TEST_CSFLE: true,
743+
MONGODB_BINARIES: '${PROJECT_DIRECTORY}/mongodb/bin',
744+
}),
745+
{ func: 'install dependencies' },
746+
{ func: 'bootstrap mongo-orchestration' },
747+
{ func: 'bootstrap kms servers' },
748+
{ func: 'assume secrets manager rule' },
749+
{ func: 'build and test alpine FLE' }
750+
]
751+
}
752+
)
753+
732754
function addPerformanceTasks() {
733755
const makePerfTask = (name, MONGODB_CLIENT_OPTIONS) => ({
734756
name,

0 commit comments

Comments
 (0)