rhel-8

Author: abr-egn

.evergreen/build-nextest-archive.sh

@@ -4,5 +4,8 @@ set -o errexit
 set -o pipefail
 
 source .evergreen/env.sh
+source .evergreen/features.sh
 
-cargo nextest archive --workspace --all-features --archive-file nextest-archive.tar.zst
+FEATURE_FLAGS+=("${STANDARD_FEATURES[@]}")
+
+cargo nextest archive --workspace $(features_option) --archive-file ${ARCHIVE_FILE}

.evergreen/cargo-test.sh

@@ -2,25 +2,12 @@
 
 CARGO_OPTIONS=()
 TEST_OPTIONS=()
-FEATURE_FLAGS=()
 CARGO_RESULT=0
 
-join_by() {
-  local IFS="$1"
-  shift
-  echo "$*"
-}
+. .evergreen/features.sh
 
 cargo_test_options() {
-  local FILTERED=()
-  for FEAT in "${FEATURE_FLAGS[@]}"; do
-    [[ "${FEAT}" != "" ]] && FILTERED+=("${FEAT}")
-  done
-  local FEATURE_OPTION=""
-  if ((${#FILTERED[@]} != 0)); then
-    FEATURE_OPTION="--features $(join_by , "${FILTERED[@]}")"
-  fi
-  echo $1 ${CARGO_OPTIONS[@]} ${FEATURE_OPTION} -- ${TEST_OPTIONS[@]}
+  echo $1 ${CARGO_OPTIONS[@]} ${features_option} -- ${TEST_OPTIONS[@]}
 }
 
 cargo_test() {

.evergreen/config.yml

@@ -80,10 +80,12 @@ buildvariants:
     expansions:
       AUTH: auth
       SSL: ssl
+      ARCHIVE_FILE: "nextest-archive.tar.zst"
     tasks:
-      - name: .standalone
-      - name: .replicaset
-      - name: .sharded
+      - name: build-nextest-archive
+      - name: .standalone .archive
+      - name: .replicaset .archive
+      - name: .sharded .archive
 
   - name: ubuntu-22.04-arm64
     display_name: "Ubuntu 22.04 (ARM64)"
@@ -419,16 +421,6 @@ buildvariants:
       #- name: .8.0
       #- name: .7.0
 
-  - name: binary-cache-wip
-    display_name: "Binary Caching WIP"
-    run_on:
-      - rhel87-small
-    expansions:
-      LIBMONGOCRYPT_OS: rhel-80-64-bit
-    tasks:
-      - build-nextest-archive
-      - run-nextest-archive
-
 ###############
 # Task Groups #
 ###############
@@ -1269,53 +1261,18 @@ tasks:
           - .evergreen/build-nextest-archive.sh
         include_expansions_in_env:
           - PROJECT_DIRECTORY
-          - MONGOCRYPT_LIB_DIR
+          - ARCHIVE_FILE
     - command: s3.put
       type: setup
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nextest-archive.tar.zst
-        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${build_id}-nextest-archive.tar.zst
+        local_file: src/${ARCHIVE_FILE}
+        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${build_id}-${ARCHIVE_FILE}
         bucket: mciuploads
         permissions: public-read
         content_type: application/zstd
-        display_name: nextest-archive.tar.zst
-  
-  - name: run-nextest-archive
-    depends_on:
-      - name: build-nextest-archive
-    commands:
-    - command: s3.get
-      type: setup
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${build_id}-nextest-archive.tar.zst
-        bucket: mciuploads
-        local_file: src/nextest-archive.tar.zst
-    - func: "install libmongocrypt"
-      type: setup
-    - func: "bootstrap mongo-orchestration"
-      type: setup
-      vars:
-        MONGODB_VERSION: latest
-        TOPOLOGY: server
-    - command: subprocess.exec
-      type: test
-      params:
-        working_dir: src
-        binary: bash
-        args:
-          - .evergreen/run-nextest-archive.sh
-        include_expansions_in_env:
-          - DRIVERS_TOOLS
-          - PROJECT_DIRECTORY
-          - SINGLE_MONGOS_LB_URI
-          - MULTI_MONGOS_LB_URI
-          - MONGODB_URI
-          - PATH
-          - LD_LIBRARY_PATH
+        display_name: ${ARCHIVE_FILE}
 
 #############
 # Functions #
@@ -1621,6 +1578,7 @@ functions:
           - ZSTD
           - ZLIB
           - SNAPPY
+          - ARCHIVE_FILE
 
   "run sync tests":
     - command: subprocess.exec

.evergreen/features.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+FEATURE_FLAGS=()
+
+STANDARD_FEATURES=("tracing-unstable" "cert-key-password" "opentelemetry" "error-backtrace")
+
+_join_by() {
+    local IFS="$1"
+    shift
+    echo "$*"
+}
+
+features_option() {
+    local FILTERED=()
+    for FEAT in "${FEATURE_FLAGS[@]}"; do
+        [[ "${FEAT}" != "" ]] && FILTERED+=("${FEAT}")
+    done
+    if ((${#FILTERED[@]} != 0)); then
+        echo "--features $(_join_by , "${FILTERED[@]}")"
+    fi
+}

.evergreen/generate-tasks/Cargo.toml

@@ -6,3 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+
+[workspace]

.evergreen/generate-tasks/src/main.rs

@@ -21,6 +21,29 @@ tasks:"
     tags: [{version}, {top_name}]
     commands:
       - func: \"bootstrap mongo-orchestration\"
+        type: setup
+        vars:
+          MONGODB_VERSION: {version}
+          TOPOLOGY: {topology}
+      - func: \"run driver test suite\"
+
+  - name: test-{version}-{top_name}-archive
+    tags: [{version}, {top_name}, archive]
+    depends_on:
+      - name: build-nextest-archive
+    commands:
+      - command: s3.get
+        type: setup
+        params:
+            aws_key: ${{aws_key}}
+            aws_secret: ${{aws_secret}}
+            remote_file: \
+                 ${{UPLOAD_BUCKET}}/${{build_variant}}/${{revision}}/\
+                 ${{build_id}}-nextest-archive.tar.zst
+            bucket: mciuploads
+            local_file: src/nextest-archive.tar.zst
+      - func: \"bootstrap mongo-orchestration\"
+        type: setup
         vars:
           MONGODB_VERSION: {version}
           TOPOLOGY: {topology}

.evergreen/run-tests.sh

@@ -6,7 +6,7 @@ set -o pipefail
 source .evergreen/env.sh
 source .evergreen/cargo-test.sh
 
-FEATURE_FLAGS+=("tracing-unstable" "cert-key-password" "opentelemetry" "error-backtrace")
+FEATURE_FLAGS+=("${STANDARD_FEATURES[@]}")
 
 if [ "$OPENSSL" = true ]; then
   FEATURE_FLAGS+=("openssl-tls")
@@ -24,6 +24,12 @@ if [ "$SNAPPY" = true ]; then
   FEATURE_FLAGS+=("snappy-compression")
 fi
 
+if [[ "${ARCHIVE_FILE}" != "" ]]; then
+  # Feature flags are set when the archive is built
+  FEATURE_FLAGS=()
+  CARGO_OPTIONS+=("--archive-file" "${ARCHIVE_FILE}" "--workspace-remap" "$(pwd)")
+fi
+
 echo "cargo test options: $(cargo_test_options)"
 
 set +o errexit
@@ -36,7 +42,7 @@ fi
 cargo_test ""
 
 # cargo-nextest doesn't support doc tests
-RUST_BACKTRACE=1 cargo test --doc $(cargo_test_options)
-((CARGO_RESULT = ${CARGO_RESULT} || $?))
+#RUST_BACKTRACE=1 cargo test --doc $(cargo_test_options)
+#((CARGO_RESULT = ${CARGO_RESULT} || $?))
 
 exit $CARGO_RESULT