chore: pull prepare shell out to script to make spawn hosts easier

nbbeeken · nbbeeken · commit 397e7345ce15 · 2022-09-15T16:06:56.000-04:00
diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml
@@ -28,81 +28,40 @@ functions:
       params:
         directory: "src"
         shallow_clone: true # speed things up by limiting clone depth to 100
+
     # Make an evergreen expansion file with dynamic values
-    - command: shell.exec
+    - command: subprocess.exec
       params:
         working_dir: "src"
-        script: |
-           # Get the current unique version of this checkout
-           if [ "${is_patch}" = "true" ]; then
-              CURRENT_VERSION=$(git describe)-patch-${version_id}
-           else
-              CURRENT_VERSION=latest
-           fi
-
-           export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
-
-           export PROJECT_DIRECTORY="$(pwd)"
-           export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
-           export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
-           export UPLOAD_BUCKET="${project}"
-
-           # fix paths on windows
-           if [ "Windows_NT" = "$OS" ]; then
-             export DRIVERS_TOOLS=$(cygpath -m -a $DRIVERS_TOOLS)
-             export MONGO_ORCHESTRATION_HOME=$(cygpath -m -a $MONGO_ORCHESTRATION_HOME)
-             export MONGODB_BINARIES=$(cygpath -m -a $MONGODB_BINARIES)
-             export PROJECT_DIRECTORY=$(cygpath -m -a $PROJECT_DIRECTORY)
-           fi
-
-           cat <<EOT > expansion.yml
-           CURRENT_VERSION: "$CURRENT_VERSION"
-           DRIVERS_TOOLS: "$DRIVERS_TOOLS"
-           MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME"
-           MONGODB_BINARIES: "$MONGODB_BINARIES"
-           UPLOAD_BUCKET: "$UPLOAD_BUCKET"
-           PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
-           PREPARE_SHELL: |
-              set -o errexit
-              set -o xtrace
-              export DRIVERS_TOOLS="$DRIVERS_TOOLS"
-              export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
-              export MONGODB_BINARIES="$MONGODB_BINARIES"
-              export UPLOAD_BUCKET="$UPLOAD_BUCKET"
-              export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
-
-              export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
-              export PATH="$MONGODB_BINARIES:$PATH"
-              export PROJECT="${project}"
-           EOT
-           # See what we've done
-           cat expansion.yml
+        binary: bash
+        env:
+          is_patch: ${is_patch}
+          project: ${project}
+        args:
+        - .evergreen/prepare-shell.sh
 
     # Load the expansion file to make an evergreen variable with the current unique version
     - command: expansions.update
       params:
         file: src/expansion.yml
 
-  "prepare resources":
-    - command: shell.exec
-      params:
-        script: |
-          ${PREPARE_SHELL}
-          git clone --depth 1 https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
-          echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
-
   "bootstrap mongo-orchestration":
-    - command: shell.exec
+    - command: subprocess.exec
       params:
-        script: |
-          ${PREPARE_SHELL}
-          MONGODB_VERSION=${VERSION} TOPOLOGY=${TOPOLOGY} \
-          AUTH=${AUTH} SSL=${SSL} \
-          ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
-          REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
-          LOAD_BALANCER=${LOAD_BALANCER} \
-          COMPRESSOR=${COMPRESSOR} \
-          bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+        binary: bash
+        add_expansions_to_env: true
+        env:
+          MONGODB_VERSION: ${VERSION}
+          TOPOLOGY: ${TOPOLOGY}
+          AUTH: ${AUTH}
+          SSL: ${SSL}
+          ORCHESTRATION_FILE: ${ORCHESTRATION_FILE}
+          REQUIRE_API_VERSION: ${REQUIRE_API_VERSION}
+          LOAD_BALANCER: ${LOAD_BALANCER}
+          COMPRESSOR: ${COMPRESSOR}
+        args:
+          - ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+
     # run-orchestration generates expansion file with the MONGODB_URI for the cluster
     - command: expansions.update
       params:
@@ -959,7 +918,6 @@ task_groups:
     setup_group_timeout_secs: 1800 # 30 minutes
     setup_group:
       - func: "fetch source"
-      - func: "prepare resources"
       - command: shell.exec
         params:
           shell: "bash"
@@ -991,7 +949,6 @@ task_groups:
 
 pre:
   - func: "fetch source"
-  - func: "prepare resources"
   - func: "windows fix"
   - func: "fix absolute paths"
   - func: "make files executable"
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -13,79 +13,34 @@ functions:
       params:
         directory: src
         shallow_clone: true
-    - command: shell.exec
+    - command: subprocess.exec
       params:
         working_dir: src
-        script: |
-          # Get the current unique version of this checkout
-          if [ "${is_patch}" = "true" ]; then
-             CURRENT_VERSION=$(git describe)-patch-${version_id}
-          else
-             CURRENT_VERSION=latest
-          fi
-
-          export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
-
-          export PROJECT_DIRECTORY="$(pwd)"
-          export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
-          export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
-          export UPLOAD_BUCKET="${project}"
-
-          # fix paths on windows
-          if [ "Windows_NT" = "$OS" ]; then
-            export DRIVERS_TOOLS=$(cygpath -m -a $DRIVERS_TOOLS)
-            export MONGO_ORCHESTRATION_HOME=$(cygpath -m -a $MONGO_ORCHESTRATION_HOME)
-            export MONGODB_BINARIES=$(cygpath -m -a $MONGODB_BINARIES)
-            export PROJECT_DIRECTORY=$(cygpath -m -a $PROJECT_DIRECTORY)
-          fi
-
-          cat <<EOT > expansion.yml
-          CURRENT_VERSION: "$CURRENT_VERSION"
-          DRIVERS_TOOLS: "$DRIVERS_TOOLS"
-          MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME"
-          MONGODB_BINARIES: "$MONGODB_BINARIES"
-          UPLOAD_BUCKET: "$UPLOAD_BUCKET"
-          PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
-          PREPARE_SHELL: |
-             set -o errexit
-             set -o xtrace
-             export DRIVERS_TOOLS="$DRIVERS_TOOLS"
-             export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
-             export MONGODB_BINARIES="$MONGODB_BINARIES"
-             export UPLOAD_BUCKET="$UPLOAD_BUCKET"
-             export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
-
-             export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
-             export PATH="$MONGODB_BINARIES:$PATH"
-             export PROJECT="${project}"
-          EOT
-          # See what we've done
-          cat expansion.yml
+        binary: bash
+        env:
+          is_patch: ${is_patch}
+          project: ${project}
+        args:
+          - .evergreen/prepare-shell.sh
     - command: expansions.update
       params:
         file: src/expansion.yml
-  prepare resources:
-    - command: shell.exec
-      params:
-        script: >
-          ${PREPARE_SHELL}
-
-          git clone --depth 1 https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
-
-          echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" >
-          $MONGO_ORCHESTRATION_HOME/orchestration.config
   bootstrap mongo-orchestration:
-    - command: shell.exec
+    - command: subprocess.exec
       params:
-        script: |
-          ${PREPARE_SHELL}
-          MONGODB_VERSION=${VERSION} TOPOLOGY=${TOPOLOGY} \
-          AUTH=${AUTH} SSL=${SSL} \
-          ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
-          REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
-          LOAD_BALANCER=${LOAD_BALANCER} \
-          COMPRESSOR=${COMPRESSOR} \
-          bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+        binary: bash
+        add_expansions_to_env: true
+        env:
+          MONGODB_VERSION: ${VERSION}
+          TOPOLOGY: ${TOPOLOGY}
+          AUTH: ${AUTH}
+          SSL: ${SSL}
+          ORCHESTRATION_FILE: ${ORCHESTRATION_FILE}
+          REQUIRE_API_VERSION: ${REQUIRE_API_VERSION}
+          LOAD_BALANCER: ${LOAD_BALANCER}
+          COMPRESSOR: ${COMPRESSOR}
+        args:
+          - ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     - command: expansions.update
       params:
         file: mo-expansion.yml
@@ -2253,7 +2208,6 @@ task_groups:
     setup_group_timeout_secs: 1800
     setup_group:
       - func: fetch source
-      - func: prepare resources
       - command: shell.exec
         params:
           shell: bash
@@ -2284,7 +2238,6 @@ task_groups:
       - .serverless
 pre:
   - func: fetch source
-  - func: prepare resources
   - func: windows fix
   - func: fix absolute paths
   - func: make files executable
diff --git a/.evergreen/prepare-shell.sh b/.evergreen/prepare-shell.sh
@@ -0,0 +1,52 @@
+#! /usr/bin/env bash
+
+set -o xtrace
+set -o errexit
+
+PROJECT_DIRECTORY="$(pwd)"
+DRIVERS_TOOLS=$(cd .. && echo "$(pwd)/drivers-tools")
+MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
+MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
+UPLOAD_BUCKET="$project"
+
+# fix paths on windows
+if [ "Windows_NT" = "${OS:-notWindows}" ]; then
+    DRIVERS_TOOLS=$(cygpath -m -a "$DRIVERS_TOOLS")
+    MONGO_ORCHESTRATION_HOME=$(cygpath -m -a "$MONGO_ORCHESTRATION_HOME")
+    MONGODB_BINARIES=$(cygpath -m -a "$MONGODB_BINARIES")
+    PROJECT_DIRECTORY=$(cygpath -m -a "$PROJECT_DIRECTORY")
+fi
+
+export PROJECT_DIRECTORY
+export DRIVERS_TOOLS
+export MONGO_ORCHESTRATION_HOME
+export MONGODB_BINARIES
+
+if [ ! -d "$DRIVERS_TOOLS" ]; then
+  # Only clone driver tools if it does not exist
+  git clone --depth=1 "https://github.com/mongodb-labs/drivers-evergreen-tools.git" "${DRIVERS_TOOLS}"
+fi
+
+echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > "$MONGO_ORCHESTRATION_HOME/orchestration.config"
+
+cat <<EOT > expansion.yml
+DRIVERS_TOOLS: "$DRIVERS_TOOLS"
+MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME"
+MONGODB_BINARIES: "$MONGODB_BINARIES"
+UPLOAD_BUCKET: "$UPLOAD_BUCKET"
+PROJECT_DIRECTORY: "$PROJECT_DIRECTORY"
+PREPARE_SHELL: |
+    set -o errexit
+    set -o xtrace
+    export DRIVERS_TOOLS="$DRIVERS_TOOLS"
+    export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
+    export MONGODB_BINARIES="$MONGODB_BINARIES"
+    export UPLOAD_BUCKET="$UPLOAD_BUCKET"
+    export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
+
+    export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
+    export PATH="$MONGODB_BINARIES:$PATH"
+    export PROJECT="${project}"
+EOT
+# See what we've done
+cat expansion.yml
diff --git a/.gitignore b/.gitignore
@@ -69,6 +69,7 @@ output
 serverless-expansion.yml
 serverless.env
 
+expansion.yml
 lb-expansion.yml
 lb.env
 
