chore: fix ecs

mongodb · Oct 9, 2024 · e54f060 · e54f060
1 parent 7ca3697
commit e54f060
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml
@@ -871,7 +871,11 @@ functions:
           echo "npm run check:aws" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
 
           cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
-          tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY . $DRIVERS_TOOLS
+
+          cd ..
+          tar -czf src.tgz src drivers-tools
+          mv src.tgz $ECS_SRC_DIR/src.tgz
+
 
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
           . ./activate-authawsvenv.sh
@@ -988,6 +992,7 @@ functions:
         env:
           MONGODB_URI: ${MONGODB_URI}
           PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
+          DRIVERS_TOOLS: ${DRIVERS_TOOLS}
         binary: bash
         args:
           - "${PROJECT_DIRECTORY}/.evergreen/run-lambda-tests.sh"

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -832,7 +832,13 @@ functions:
 
           cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
 
-          tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY . $DRIVERS_TOOLS
+
+          cd ..
+
+          tar -czf src.tgz src drivers-tools
+
+          mv src.tgz $ECS_SRC_DIR/src.tgz
+
 
 
           cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
@@ -957,6 +963,7 @@ functions:
         env:
           MONGODB_URI: ${MONGODB_URI}
           PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
+          DRIVERS_TOOLS: ${DRIVERS_TOOLS}
         binary: bash
         args:
           - ${PROJECT_DIRECTORY}/.evergreen/run-lambda-tests.sh

diff --git a/.evergreen/run-azure-kms-tests.sh b/.evergreen/run-azure-kms-tests.sh
@@ -5,6 +5,8 @@ set -o errexit
 pushd "src"
 PROJECT_DIRECTORY="$(pwd)"
 export PROJECT_DIRECTORY
+source "$PROJECT_DIRECTORY/.evergreen/prepare-shell.sh"
+
 source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
 set -o xtrace

diff --git a/.evergreen/run-gcp-kms-tests.sh b/.evergreen/run-gcp-kms-tests.sh
@@ -5,6 +5,8 @@ set -o errexit
 pushd "src"
 PROJECT_DIRECTORY="$(pwd)"
 export PROJECT_DIRECTORY
+source "$PROJECT_DIRECTORY/.evergreen/prepare-shell.sh"
+
 source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
 set -o xtrace

diff --git a/.evergreen/run-mongodb-aws-ecs-test.sh b/.evergreen/run-mongodb-aws-ecs-test.sh
@@ -3,11 +3,13 @@ set -o xtrace   # Write all commands first to stderr
 set -o errexit  # Exit the script with error if any of the commands fail
 
 export MONGODB_URI="$1"
-PROJECT_DIRECTORY="$(pwd)/src"
 
-# untar packed archive
-cd $PROJECT_DIRECTORY
-tar -xzf src.tgz .
+tar -xzf src/src.tgz
+# produces src/ and drivers-tools/
+
+cd src
+
+source ./.evergreen/prepare-shell.sh # should not run git clone
 
 # load node.js
 source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh