Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c5bed5e

Browse files
authored
test(NODE-6495): add drivers-evergreen-tools a submodule (#4509)
1 parent 4f03359 commit c5bed5e

14 files changed

+51
-63
lines changed

‎.evergreen/docker/Dockerfile.musl‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,3 @@ git --version
1212
c++ --version
1313
g++ --version
1414
EOF
15-
16-
# clone drivers evergreen tools into the same location that it lives on the host machine
17-
# this ensures any paths configured in variables by drivers-evergreen-tools work
18-
# in the container too.
19-
ARG DRIVERS_TOOLS=drivers-evergreen-tools
20-
WORKDIR ${DRIVERS_TOOLS}
21-
RUN git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git .

‎.evergreen/prepare-mongodb-aws-ecs-auth.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cat $ECS_SRC_DIR/.evergreen/run-mongodb-aws-ecs-test.sh
2121

2222
# tar the file and drivers tools and do the same
2323
cd ..
24-
tar -czf src.tgz src drivers-tools
24+
tar -czf src.tgz src
2525
mv src.tgz $ECS_SRC_DIR/src.tgz
2626

2727
export MONGODB_BINARIES="${MONGODB_BINARIES}"

‎.evergreen/prepare-shell.sh‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66

77
# This script prepares a shell to run the remaining scripts in this folder
88
# It MUST be kept idempotent! It will overwrite the orchestration config and expansion.yml file upon every run
9-
# and it will only clone drivers-tools if they do not exist one directory above our driver src
109

1110
PROJECT_DIRECTORY="$(pwd)"
12-
DRIVERS_TOOLS=$(cd .. &&echo"$(pwd)/drivers-tools")
11+
DRIVERS_TOOLS="$(pwd)/drivers-evergreen-tools"
1312
MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
1413
MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
1514
UPLOAD_BUCKET="${project}"
@@ -30,12 +29,12 @@ export MONGODB_BINARIES
3029
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
3130
export PATH="$MONGODB_BINARIES:$PATH"
3231

33-
if [ !-d"$DRIVERS_TOOLS" ];then
34-
# Only clone driver tools if it does not exist
35-
git clone --depth=1 "https://github.com/mongodb-labs/drivers-evergreen-tools.git""${DRIVERS_TOOLS}"
36-
fi
37-
38-
echo"installed DRIVERS_TOOLS from commit $(git -C "${DRIVERS_TOOLS}" rev-parse HEAD)"
32+
# Note the evergreen option on git.get_project recurse_submodules does not work, so do it here.
33+
# We ignore errors in case we are running in a container where git doesn't trust the tmp directory.
34+
set +e
35+
git submodule init
36+
git submodule update
37+
set -e
3938

4039
cat <<EOT > "$MONGO_ORCHESTRATION_HOME/orchestration.config"
4140
{

‎.evergreen/run-alpine-fle-tests.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,10 @@ set -o xtrace
99
export npm_config_cache=$(pwd)/.cache
1010
npm install
1111

12+
# Fix to point at the drivers tools pems installed in src.
13+
export CSFLE_TLS_CA_FILE=$(pwd)/drivers-evergreen-tools/.evergreen/x509gen/ca.pem
14+
export CSFLE_TLS_CERT_FILE=$(pwd)/drivers-evergreen-tools/.evergreen/x509gen/server.pem
15+
export CSFLE_TLS_CLIENT_CERT_FILE=$(pwd)/drivers-evergreen-tools/.evergreen/x509gen/client.pem
16+
1217
ALPINE=true \
1318
npm run check:csfle

‎.evergreen/run-deployed-azure-kms-tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
1111
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
1212

1313
echo "compressing node driver source and tools ... begin"
14-
tar -czf node-driver-source.tgz src drivers-tools
14+
tar -czf node-driver-source.tgz src
1515
echo "compressing node driver source and tools ... end"
1616

1717
export AZUREKMS_SRC=node-driver-source.tgz

‎.evergreen/run-mongodb-aws-ecs-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -o errexit # Exit the script with error if any of the commands fail
55
export MONGODB_URI="1ドル"
66

77
tar -xzf src/src.tgz
8-
# produces src/ and drivers-tools/
8+
# produces src/
99

1010
cd src
1111

‎.evergreen/run-oidc-tests-azure.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -o errexit # Exit the script with error if any of the commands fail
44

55
export AZUREOIDC_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
66
cd ..
7-
tar -czf $AZUREOIDC_DRIVERS_TAR_FILE src drivers-tools
7+
tar -czf $AZUREOIDC_DRIVERS_TAR_FILE src
88
cd -
99
export AZUREOIDC_TEST_CMD="source ./env.sh && cd src && ENVIRONMENT=azure ./.evergreen/${SCRIPT}"
1010
export PROJECT_DIRECTORY=$PROJECT_DIRECTORY

‎.evergreen/run-oidc-tests-gcp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -o errexit # Exit the script with error if any of the commands fail
44

55
export GCPOIDC_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
66
cd ..
7-
tar -czf $GCPOIDC_DRIVERS_TAR_FILE src drivers-tools
7+
tar -czf $GCPOIDC_DRIVERS_TAR_FILE src
88
cd -
99
export GCPOIDC_TEST_CMD="source ./secrets-export.sh drivers/gcpoidc && cd src && ENVIRONMENT=gcp ./.evergreen/${SCRIPT}"
1010
export PROJECT_DIRECTORY=$PROJECT_DIRECTORY

‎.evergreen/run-oidc-tests-k8s.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -o errexit # Exit the script with error if any of the commands fail
44

55
export K8S_DRIVERS_TAR_FILE=/tmp/node-mongodb-native.tgz
66
cd ..
7-
tar -czf $K8S_DRIVERS_TAR_FILE src drivers-tools
7+
tar -czf $K8S_DRIVERS_TAR_FILE src
88
cd -
99
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/setup-pod.sh
1010
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/k8s/run-self-test.sh

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55

66
version: 2
77
updates:
8+
- package-ecosystem: "gitsubmodule" # See documentation for possible values
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"
812
- package-ecosystem: "github-actions" # See documentation for possible values
913
directory: "/" # Location of package manifests
1014
schedule:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /