From a67441c9361ea40c4bef84b571bde9d3b532de07 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 18 Sep 2023 08:29:45 +0200 Subject: [PATCH 01/44] Remove unused functions and tasks --- .evergreen/config.yml | 112 ------------------------------------------ 1 file changed, 112 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ff96fe822..4fab53f8c 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -140,16 +140,6 @@ functions: fi echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config - "upload release": - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: ${project}.tar.gz - remote_file: ${UPLOAD_BUCKET}/${project}-${CURRENT_VERSION}.tar.gz - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/x-gzip} # Upload build artifacts that other tasks may depend on # Note this URL needs to be totally unique, while predictable for the next task @@ -192,15 +182,6 @@ functions: # EVG-1105: Use s3.get extract_to: ./ script: "cd .. && rm -rf ${PROJECT_DIRECTORY} && mkdir ${PROJECT_DIRECTORY}/ && tar xf build.tar.gz -C ${PROJECT_DIRECTORY}/" - "exec compile script" : - - command: shell.exec - type: test - params: - working_dir: "src" - script: | - ${PREPARE_SHELL} - [ -f ${PROJECT_DIRECTORY}/${file} ] && BUILDTOOL="${buildtool}" sh ${PROJECT_DIRECTORY}/${file} || echo "${PROJECT_DIRECTORY}/${file} not available, skipping" - "compile driver" : - command: shell.exec type: test @@ -210,63 +191,6 @@ functions: ${PREPARE_SHELL} sh ${PROJECT_DIRECTORY}/.evergreen/compile-unix.sh - "exec script" : - - command: shell.exec - type: test - params: - working_dir: "src" - script: | - ${PREPARE_SHELL} - [ -f ${PROJECT_DIRECTORY}/${file} ] && sh ${PROJECT_DIRECTORY}/${file} || echo "${PROJECT_DIRECTORY}/${file} not available, skipping" - - "upload coverage" : - - command: shell.exec - params: - silent: true - script: | - export AWS_ACCESS_KEY_ID=${aws_key} - export AWS_SECRET_ACCESS_KEY=${aws_secret} - aws s3 cp ${PROJECT_DIRECTORY}/coverage s3://mciuploads/${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/coverage/ --recursive --acl public-read --region us-east-1 - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: ${PROJECT_DIRECTORY}/coverage/index.html - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/coverage/index.html - bucket: mciuploads - permissions: public-read - content_type: text/html - display_name: "Coverage Report" - - "upload scan artifacts" : - - command: shell.exec - type: test - params: - script: | - cd - if find ${PROJECT_DIRECTORY}/scan -name \*.html | grep -q html; then - (cd ${PROJECT_DIRECTORY}/scan && find . -name index.html -exec echo "
  • {}
    • " \;) >> scan.html - else - echo "No issues found" > scan.html - fi - - command: shell.exec - params: - silent: true - script: | - export AWS_ACCESS_KEY_ID=${aws_key} - export AWS_SECRET_ACCESS_KEY=${aws_secret} - aws s3 cp ${PROJECT_DIRECTORY}/scan s3://mciuploads/${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/scan/ --recursive --acl public-read --region us-east-1 - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: ${PROJECT_DIRECTORY}/scan.html - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/scan/index.html - bucket: mciuploads - permissions: public-read - content_type: text/html - display_name: "Scan Build Report" - "upload mo artifacts": - command: shell.exec params: @@ -495,39 +419,6 @@ post: - func: "cleanup" tasks: - - - # Wildcard task. Do you need to find out what tools are available and where? - # Throw it here, and execute this task on all buildvariants - - name: getdata - commands: - - command: shell.exec - type: test - params: - script: | - . ${DRIVERS_TOOLS}/.evergreen/download-mongodb.sh || true - get_distro || true - echo $DISTRO - echo $MARCH - echo $OS - uname -a || true - ls /etc/*release* || true - cc --version || true - gcc --version || true - clang --version || true - gcov --version || true - lcov --version || true - llvm-cov --version || true - echo $PATH - ls -la /usr/local/Cellar/llvm/*/bin/ || true - ls -la /usr/local/Cellar/ || true - scan-build --version || true - genhtml --version || true - valgrind --version || true - - -# Standard test tasks {{{ - - name: "test-standalone" tags: ["standalone"] commands: @@ -1025,9 +916,6 @@ tasks: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" -# }}} - - axes: - id: mongodb-versions display_name: MongoDB Version From dc6df709f0c0d82307964f98235b0ffd8a514d83 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 18 Sep 2023 08:43:10 +0200 Subject: [PATCH 02/44] Fix indentation --- .evergreen/config.yml | 1194 ++++++++++++++++++++--------------------- 1 file changed, 597 insertions(+), 597 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 4fab53f8c..2d9990022 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -419,502 +419,502 @@ post: - func: "cleanup" tasks: - - name: "test-standalone" - tags: ["standalone"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - - func: "run tests" - - - name: "test-standalone-auth" - tags: ["standalone"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - - func: "run tests" - - - name: "test-standalone-ssl" - tags: ["standalone"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - - func: "run tests" - vars: - SSL: "yes" - - - name: "test-replicaset" - tags: ["replicaset"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - - func: "run tests" - - - name: "test-replicaset-auth" - tags: ["replicaset"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - - func: "run tests" - - - name: "test-sharded" - tags: ["sharded"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - - func: "run tests" - - - name: "test-atlas" - tags: ["atlas"] - commands: - - func: "compile driver" - - func: "decrypt atlas URI list" - - func: "run tests" - vars: - TESTS: "tests/atlas.phpt" - - - name: "test-skip_crypt_shared" - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - - name: "test-loadBalanced" - tags: ["loadbalanced"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - LOAD_BALANCER: "true" - SSL: "yes" - - func: "start load balancer" - - func: "run tests" - vars: - # Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI - MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" - SSL: "yes" - # Note: "stop load balancer" will be called from "post" - - - name: "test-requireApiVersion" - tags: ["versioned_api"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - REQUIRE_API_VERSION: "yes" - - func: "run tests" - vars: - API_VERSION: "1" - - - name: "ocsp-test_1-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_1" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_1-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_1" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_1-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_1" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_1-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_1" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_2-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_2" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_2-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_2" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_2-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_2" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_2-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_2" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_3-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_3" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_3-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_3" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_3-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_3" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_3-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_3" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_4-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_4" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_4-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_4" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_4-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_4" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_4-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_4" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-soft_fail_test-rsa" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-soft_fail_test-ecdsa" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_1-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_1-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_1-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_2-rsa" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_2-ecdsa" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "test-standalone" + tags: ["standalone"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + - func: "run tests" + + - name: "test-standalone-auth" + tags: ["standalone"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + - func: "run tests" + + - name: "test-standalone-ssl" + tags: ["standalone"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-replicaset" + tags: ["replicaset"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + - func: "run tests" + + - name: "test-replicaset-auth" + tags: ["replicaset"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + - func: "run tests" + + - name: "test-sharded" + tags: ["sharded"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + - func: "run tests" + + - name: "test-atlas" + tags: ["atlas"] + commands: + - func: "compile driver" + - func: "decrypt atlas URI list" + - func: "run tests" + vars: + TESTS: "tests/atlas.phpt" + + - name: "test-skip_crypt_shared" + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" + + - name: "test-loadBalanced" + tags: ["loadbalanced"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + # Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" + # Note: "stop load balancer" will be called from "post" + + - name: "test-requireApiVersion" + tags: ["versioned_api"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + - func: "run tests" + vars: + API_VERSION: "1" + + - name: "ocsp-test_1-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" axes: - id: mongodb-versions @@ -1088,104 +1088,104 @@ axes: buildvariants: -# Test all PHP versions with latest-stable MongoDB on all operating systems -- matrix_name: "test-php-versions" - matrix_spec: - os: - - debian11 - - debian10 - - rhel90 - - rhel83-zseries - - rhel82-arm64 - - rhel81-power8 - - rhel80 - - rhel76 - - ubuntu2204-arm64 - - ubuntu2204 - - ubuntu2004-arm64 - - ubuntu2004 - mongodb-edge-versions: latest-stable - php-versions: "*" - display_name: "${os}, ${mongodb-edge-versions}, ${php-versions}" - exclude_spec: - # Exclude "latest-stable" PHP version for Debian 11 (see: test-mongodb-versions matrix) - - { "os": "debian11", "mongodb-edge-versions": "*", "php-versions": "8.2" } - # Exclude PHP versions older than 8.1 on RHEL 9 and Ubuntu 22.04 (OpenSSL 3 is only supported on PHP 8.1+) - - { "os": ["rhel90", "ubuntu2204-arm64", "ubuntu2204"], "mongodb-edge-versions": "*", "php-versions": ["7.4", "8.0"] } - tasks: - - name: "test-standalone-ssl" - - name: "test-replicaset-auth" - - name: "test-sharded" - -# Test all topologies and MongoDB versions with latest-stable PHP version on Debian -- matrix_name: "test-mongodb-versions" - matrix_spec: { "os": ["debian92", "debian11"], "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "${os}, ${mongodb-versions}, ${php-edge-versions}" - exclude_spec: - # Debian 9.2 only supports up to MongoDB 5.0 - - { "os": "debian92", "mongodb-versions": ["6.0", "7.0", "rapid", "latest"], "php-edge-versions": "latest-stable" } - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-standalone" - - name: "test-standalone-auth" - - name: "test-standalone-ssl" - - name: "test-replicaset" - - name: "test-replicaset-auth" - - name: "test-sharded" - -# Test alternative storage engines on MongoDB 4.0 -- matrix_name: "test-storage-engines" - matrix_spec: { "os": "debian92", "mongodb-versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": ["inmemory", "mmapv1"] } - display_name: "${storage-engine}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" - tasks: - - name: "test-standalone" - -- matrix_name: "libmongoc-versions" - matrix_spec: { "os": "debian11", "mongodb-edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" } - display_name: "libmongoc ${libmongoc-version}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" - tasks: - - name: "test-standalone-ssl" - - name: "test-replicaset-auth" - - name: "test-sharded" - -- matrix_name: "atlas-connectivity-tests" - matrix_spec: { "os": "debian11", "php-edge-versions": "latest-stable" } - display_name: "Atlas Connectivity" - tasks: - - name: "test-atlas" - -- matrix_name: "test-ocsp" - matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "OCSP tests - ${mongodb-versions}" - exclude_spec: - # OCSP is available from MongoDB 4.4+ (Debian 10 has MongoDB 4.4+) - - { "os": "debian10", "mongodb-versions": ["3.6", "4.0", "4.2"], "php-edge-versions": "latest-stable" } - tasks: - - name: ".ocsp" - -- matrix_name: "test-requireApiVersion" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "Versioned API - ${mongodb-versions}" - exclude_spec: - # Stable API is available from MongoDB 5.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-requireApiVersion" - -- matrix_name: "test-loadBalanced" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "Load balanced - ${mongodb-versions}" - exclude_spec: - # Load balancer is available from MongoDB 5.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-loadBalanced" - -- matrix_name: "test-csfle-skip_crypt_shared" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "CSFLE skip_crypt_shared - ${mongodb-versions}" - exclude_spec: - # CSFLE crypt_shared is available from MongoDB 6.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-skip_crypt_shared" + # Test all PHP versions with latest-stable MongoDB on all operating systems + - matrix_name: "test-php-versions" + matrix_spec: + os: + - debian11 + - debian10 + - rhel90 + - rhel83-zseries + - rhel82-arm64 + - rhel81-power8 + - rhel80 + - rhel76 + - ubuntu2204-arm64 + - ubuntu2204 + - ubuntu2004-arm64 + - ubuntu2004 + mongodb-edge-versions: latest-stable + php-versions: "*" + display_name: "${os}, ${mongodb-edge-versions}, ${php-versions}" + exclude_spec: + # Exclude "latest-stable" PHP version for Debian 11 (see: test-mongodb-versions matrix) + - { "os": "debian11", "mongodb-edge-versions": "*", "php-versions": "8.2" } + # Exclude PHP versions older than 8.1 on RHEL 9 and Ubuntu 22.04 (OpenSSL 3 is only supported on PHP 8.1+) + - { "os": ["rhel90", "ubuntu2204-arm64", "ubuntu2204"], "mongodb-edge-versions": "*", "php-versions": ["7.4", "8.0"] } + tasks: + - name: "test-standalone-ssl" + - name: "test-replicaset-auth" + - name: "test-sharded" + + # Test all topologies and MongoDB versions with latest-stable PHP version on Debian + - matrix_name: "test-mongodb-versions" + matrix_spec: { "os": ["debian92", "debian11"], "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "${os}, ${mongodb-versions}, ${php-edge-versions}" + exclude_spec: + # Debian 9.2 only supports up to MongoDB 5.0 + - { "os": "debian92", "mongodb-versions": ["6.0", "7.0", "rapid", "latest"], "php-edge-versions": "latest-stable" } + - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } + tasks: + - name: "test-standalone" + - name: "test-standalone-auth" + - name: "test-standalone-ssl" + - name: "test-replicaset" + - name: "test-replicaset-auth" + - name: "test-sharded" + + # Test alternative storage engines on MongoDB 4.0 + - matrix_name: "test-storage-engines" + matrix_spec: { "os": "debian92", "mongodb-versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": ["inmemory", "mmapv1"] } + display_name: "${storage-engine}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" + tasks: + - name: "test-standalone" + + - matrix_name: "libmongoc-versions" + matrix_spec: { "os": "debian11", "mongodb-edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" } + display_name: "libmongoc ${libmongoc-version}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" + tasks: + - name: "test-standalone-ssl" + - name: "test-replicaset-auth" + - name: "test-sharded" + + - matrix_name: "atlas-connectivity-tests" + matrix_spec: { "os": "debian11", "php-edge-versions": "latest-stable" } + display_name: "Atlas Connectivity" + tasks: + - name: "test-atlas" + + - matrix_name: "test-ocsp" + matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "OCSP tests - ${mongodb-versions}" + exclude_spec: + # OCSP is available from MongoDB 4.4+ (Debian 10 has MongoDB 4.4+) + - { "os": "debian10", "mongodb-versions": ["3.6", "4.0", "4.2"], "php-edge-versions": "latest-stable" } + tasks: + - name: ".ocsp" + + - matrix_name: "test-requireApiVersion" + matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "Versioned API - ${mongodb-versions}" + exclude_spec: + # Stable API is available from MongoDB 5.0+ + - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } + tasks: + - name: "test-requireApiVersion" + + - matrix_name: "test-loadBalanced" + matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "Load balanced - ${mongodb-versions}" + exclude_spec: + # Load balancer is available from MongoDB 5.0+ + - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } + tasks: + - name: "test-loadBalanced" + + - matrix_name: "test-csfle-skip_crypt_shared" + matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "CSFLE skip_crypt_shared - ${mongodb-versions}" + exclude_spec: + # CSFLE crypt_shared is available from MongoDB 6.0+ + - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } + tasks: + - name: "test-skip_crypt_shared" From 780a9e4d104c4e0585958c4e99d6b1ad8062a896 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 18 Sep 2023 09:46:44 +0200 Subject: [PATCH 03/44] POC: Use task group to test local deployments --- .evergreen/config.yml | 771 +++++++++++++++++++++++++++++++++++------- 1 file changed, 643 insertions(+), 128 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 2d9990022..fcd3109d0 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -401,34 +401,21 @@ functions: ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop fi -pre: - - func: "fetch source" - - func: "prepare resources" - - func: "windows fix" - - func: "fix absolute paths" - - func: "init test-results" - - func: "make files executable" - - func: "install dependencies" - -post: - - func: "upload working dir" - - func: "upload mo artifacts" - - func: "upload test results" - - func: "stop load balancer" - - func: "stop mongo-orchestration" - - func: "cleanup" - -tasks: - - name: "test-standalone" + # + # Tasks for local deployments + # + + # MongoDB latest + - name: "test-mongodb-latest-standalone" tags: ["standalone"] commands: - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" + MONGODB_VERSION: "latest" - func: "run tests" - - - name: "test-standalone-auth" + - name: "test-mongodb-latest-standalone-auth" tags: ["standalone"] commands: - func: "compile driver" @@ -436,9 +423,9 @@ tasks: vars: TOPOLOGY: "server" AUTH: "auth" + MONGODB_VERSION: "latest" - func: "run tests" - - - name: "test-standalone-ssl" + - name: "test-mongodb-latest-standalone-ssl" tags: ["standalone"] commands: - func: "compile driver" @@ -446,20 +433,20 @@ tasks: vars: TOPOLOGY: "server" SSL: "yes" + MONGODB_VERSION: "latest" - func: "run tests" vars: SSL: "yes" - - - name: "test-replicaset" + - name: "test-mongodb-latest-replicaset" tags: ["replicaset"] commands: - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" + MONGODB_VERSION: "latest" - func: "run tests" - - - name: "test-replicaset-auth" + - name: "test-mongodb-latest-replicaset-auth" tags: ["replicaset"] commands: - func: "compile driver" @@ -467,17 +454,510 @@ tasks: vars: TOPOLOGY: "replica_set" AUTH: "auth" + MONGODB_VERSION: "latest" + - func: "run tests" + - name: "test-mongodb-latest-sharded" + tags: ["sharded"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "latest" - func: "run tests" - - name: "test-sharded" + # MongoDB Rapid Release + - name: "test-mongodb-rapid-standalone" + tags: ["standalone"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-standalone-auth" + tags: ["standalone"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-standalone-ssl" + tags: ["standalone"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "rapid" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-rapid-replicaset" + tags: ["replicaset"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-replicaset-auth" + tags: ["replicaset"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-sharded" tags: ["sharded"] commands: - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "rapid" + - func: "run tests" + + # MongoDB 7.0 + - name: "test-mongodb-70-standalone" + tags: ["standalone", "7.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-70-standalone-auth" + tags: ["standalone", "7.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-70-standalone-ssl" + tags: ["standalone", "7.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "7.0" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-70-replicaset" + tags: ["replicaset", "7.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-70-replicaset-auth" + tags: ["replicaset", "7.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-70-sharded" + tags: ["sharded", "7.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "7.0" + - func: "run tests" + + # MongoDB 6.0 + - name: "test-mongodb-60-standalone" + tags: ["standalone", "6.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-60-standalone-auth" + tags: ["standalone", "6.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-60-standalone-ssl" + tags: ["standalone", "6.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "6.0" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-60-replicaset" + tags: ["replicaset", "6.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-60-replicaset-auth" + tags: ["replicaset", "6.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-60-sharded" + tags: ["sharded", "6.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "6.0" + - func: "run tests" + + # MongoDB 5.0 + - name: "test-mongodb-50-standalone" + tags: ["standalone", "5.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-50-standalone-auth" + tags: ["standalone", "5.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-50-standalone-ssl" + tags: ["standalone", "5.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "5.0" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-50-replicaset" + tags: ["replicaset", "5.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-50-replicaset-auth" + tags: ["replicaset", "5.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-50-sharded" + tags: ["sharded", "5.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "5.0" + - func: "run tests" + + # MongoDB 4.4 + - name: "test-mongodb-44-standalone" + tags: ["standalone", "4.4"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-44-standalone-auth" + tags: ["standalone", "4.4"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-44-standalone-ssl" + tags: ["standalone", "4.4"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.4" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-44-replicaset" + tags: ["replicaset", "4.4"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-44-replicaset-auth" + tags: ["replicaset", "4.4"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-44-sharded" + tags: ["sharded", "4.4"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.4" - func: "run tests" + # MongoDB 4.2 + - name: "test-mongodb-42-standalone" + tags: ["standalone", "4.2"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-42-standalone-auth" + tags: ["standalone", "4.2"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-42-standalone-ssl" + tags: ["standalone", "4.2"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.2" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-42-replicaset" + tags: ["replicaset", "4.2"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-42-replicaset-auth" + tags: ["replicaset", "4.2"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-42-sharded" + tags: ["sharded", "4.2"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.2" + - func: "run tests" + + # MongoDB 4.0 + - name: "test-mongodb-40-standalone" + tags: ["standalone", "4.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-40-standalone-auth" + tags: ["standalone", "4.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-40-standalone-ssl" + tags: ["standalone", "4.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.0" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-40-replicaset" + tags: ["replicaset", "4.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-40-replicaset-auth" + tags: ["replicaset", "4.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-40-sharded" + tags: ["sharded", "4.0"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.0" + - func: "run tests" + + # MongoDB 3.6 + - name: "test-mongodb-36-standalone" + tags: ["standalone", "3.6"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-36-standalone-auth" + tags: ["standalone", "3.6"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-36-standalone-ssl" + tags: ["standalone", "3.6"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "3.6" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-36-replicaset" + tags: ["replicaset", "3.6"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-36-replicaset-auth" + tags: ["replicaset", "3.6"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-36-sharded" + tags: ["sharded", "3.6"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "3.6" + - func: "run tests" + + # + # Old tasks + # + - name: "test-atlas" tags: ["atlas"] commands: @@ -916,6 +1396,31 @@ tasks: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" +task_groups: + - name: test-local-deployment + setup_group: + - func: "fetch source" + - func: "prepare resources" + - func: "windows fix" + - func: "fix absolute paths" + - func: "init test-results" + - func: "make files executable" + - func: "install dependencies" + teardown_group: + - func: "upload working dir" + - func: "upload mo artifacts" + - func: "upload test results" + - func: "stop load balancer" + - func: "stop mongo-orchestration" + - func: "cleanup" + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - ".standalone" + - ".replicaset" + - ".sharded" + + axes: - id: mongodb-versions display_name: MongoDB Version @@ -1088,104 +1593,114 @@ axes: buildvariants: - # Test all PHP versions with latest-stable MongoDB on all operating systems - - matrix_name: "test-php-versions" - matrix_spec: - os: - - debian11 - - debian10 - - rhel90 - - rhel83-zseries - - rhel82-arm64 - - rhel81-power8 - - rhel80 - - rhel76 - - ubuntu2204-arm64 - - ubuntu2204 - - ubuntu2004-arm64 - - ubuntu2004 - mongodb-edge-versions: latest-stable - php-versions: "*" - display_name: "${os}, ${mongodb-edge-versions}, ${php-versions}" - exclude_spec: - # Exclude "latest-stable" PHP version for Debian 11 (see: test-mongodb-versions matrix) - - { "os": "debian11", "mongodb-edge-versions": "*", "php-versions": "8.2" } - # Exclude PHP versions older than 8.1 on RHEL 9 and Ubuntu 22.04 (OpenSSL 3 is only supported on PHP 8.1+) - - { "os": ["rhel90", "ubuntu2204-arm64", "ubuntu2204"], "mongodb-edge-versions": "*", "php-versions": ["7.4", "8.0"] } - tasks: - - name: "test-standalone-ssl" - - name: "test-replicaset-auth" - - name: "test-sharded" - - # Test all topologies and MongoDB versions with latest-stable PHP version on Debian - - matrix_name: "test-mongodb-versions" - matrix_spec: { "os": ["debian92", "debian11"], "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "${os}, ${mongodb-versions}, ${php-edge-versions}" - exclude_spec: - # Debian 9.2 only supports up to MongoDB 5.0 - - { "os": "debian92", "mongodb-versions": ["6.0", "7.0", "rapid", "latest"], "php-edge-versions": "latest-stable" } - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-standalone" - - name: "test-standalone-auth" - - name: "test-standalone-ssl" - - name: "test-replicaset" - - name: "test-replicaset-auth" - - name: "test-sharded" - - # Test alternative storage engines on MongoDB 4.0 - - matrix_name: "test-storage-engines" - matrix_spec: { "os": "debian92", "mongodb-versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": ["inmemory", "mmapv1"] } - display_name: "${storage-engine}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" - tasks: - - name: "test-standalone" - - - matrix_name: "libmongoc-versions" - matrix_spec: { "os": "debian11", "mongodb-edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" } - display_name: "libmongoc ${libmongoc-version}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" - tasks: - - name: "test-standalone-ssl" - - name: "test-replicaset-auth" - - name: "test-sharded" - - - matrix_name: "atlas-connectivity-tests" - matrix_spec: { "os": "debian11", "php-edge-versions": "latest-stable" } - display_name: "Atlas Connectivity" - tasks: - - name: "test-atlas" - - - matrix_name: "test-ocsp" - matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "OCSP tests - ${mongodb-versions}" - exclude_spec: - # OCSP is available from MongoDB 4.4+ (Debian 10 has MongoDB 4.4+) - - { "os": "debian10", "mongodb-versions": ["3.6", "4.0", "4.2"], "php-edge-versions": "latest-stable" } - tasks: - - name: ".ocsp" - - - matrix_name: "test-requireApiVersion" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "Versioned API - ${mongodb-versions}" - exclude_spec: - # Stable API is available from MongoDB 5.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-requireApiVersion" - - - matrix_name: "test-loadBalanced" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "Load balanced - ${mongodb-versions}" - exclude_spec: - # Load balancer is available from MongoDB 5.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-loadBalanced" - - - matrix_name: "test-csfle-skip_crypt_shared" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "CSFLE skip_crypt_shared - ${mongodb-versions}" - exclude_spec: - # CSFLE crypt_shared is available from MongoDB 6.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } + - name: debian11-php82-local + display_name: Debian 11, PHP 8.2, Local + run_on: debian11-small + variables: + PHP_VERSION: "8.2" tasks: - - name: "test-skip_crypt_shared" + - name: "test-local-deployment" + +# +# Old build variants preserved below +# +# - matrix_name: "test-php-versions" +# matrix_spec: +# os: +# - debian11 +# - debian10 +# - rhel90 +# - rhel83-zseries +# - rhel82-arm64 +# - rhel81-power8 +# - rhel80 +# - rhel76 +# - ubuntu2204-arm64 +# - ubuntu2204 +# - ubuntu2004-arm64 +# - ubuntu2004 +# mongodb-edge-versions: latest-stable +# php-versions: "*" +# display_name: "${os}, ${mongodb-edge-versions}, ${php-versions}" +# exclude_spec: +# # Exclude "latest-stable" PHP version for Debian 11 (see: test-mongodb-versions matrix) +# - { "os": "debian11", "mongodb-edge-versions": "*", "php-versions": "8.2" } +# # Exclude PHP versions older than 8.1 on RHEL 9 and Ubuntu 22.04 (OpenSSL 3 is only supported on PHP 8.1+) +# - { "os": ["rhel90", "ubuntu2204-arm64", "ubuntu2204"], "mongodb-edge-versions": "*", "php-versions": ["7.4", "8.0"] } +# tasks: +# - name: "test-standalone-ssl" +# - name: "test-replicaset-auth" +# - name: "test-sharded" +# +# # Test all topologies and MongoDB versions with latest-stable PHP version on Debian +# - matrix_name: "test-mongodb-versions" +# matrix_spec: { "os": ["debian92", "debian11"], "mongodb-versions": "*", "php-edge-versions": "latest-stable" } +# display_name: "${os}, ${mongodb-versions}, ${php-edge-versions}" +# exclude_spec: +# # Debian 9.2 only supports up to MongoDB 5.0 +# - { "os": "debian92", "mongodb-versions": ["6.0", "7.0", "rapid", "latest"], "php-edge-versions": "latest-stable" } +# - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } +# tasks: +# - name: "test-standalone" +# - name: "test-standalone-auth" +# - name: "test-standalone-ssl" +# - name: "test-replicaset" +# - name: "test-replicaset-auth" +# - name: "test-sharded" +# +# # Test alternative storage engines on MongoDB 4.0 +# - matrix_name: "test-storage-engines" +# matrix_spec: { "os": "debian92", "mongodb-versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": ["inmemory", "mmapv1"] } +# display_name: "${storage-engine}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" +# tasks: +# - name: "test-standalone" +# +# - matrix_name: "libmongoc-versions" +# matrix_spec: { "os": "debian11", "mongodb-edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" } +# display_name: "libmongoc ${libmongoc-version}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" +# tasks: +# - name: "test-standalone-ssl" +# - name: "test-replicaset-auth" +# - name: "test-sharded" +# +# - matrix_name: "atlas-connectivity-tests" +# matrix_spec: { "os": "debian11", "php-edge-versions": "latest-stable" } +# display_name: "Atlas Connectivity" +# tasks: +# - name: "test-atlas" +# +# - matrix_name: "test-ocsp" +# matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } +# display_name: "OCSP tests - ${mongodb-versions}" +# exclude_spec: +# # OCSP is available from MongoDB 4.4+ (Debian 10 has MongoDB 4.4+) +# - { "os": "debian10", "mongodb-versions": ["3.6", "4.0", "4.2"], "php-edge-versions": "latest-stable" } +# tasks: +# - name: ".ocsp" +# +# - matrix_name: "test-requireApiVersion" +# matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } +# display_name: "Versioned API - ${mongodb-versions}" +# exclude_spec: +# # Stable API is available from MongoDB 5.0+ +# - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } +# tasks: +# - name: "test-requireApiVersion" +# +# - matrix_name: "test-loadBalanced" +# matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } +# display_name: "Load balanced - ${mongodb-versions}" +# exclude_spec: +# # Load balancer is available from MongoDB 5.0+ +# - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } +# tasks: +# - name: "test-loadBalanced" +# +# - matrix_name: "test-csfle-skip_crypt_shared" +# matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } +# display_name: "CSFLE skip_crypt_shared - ${mongodb-versions}" +# exclude_spec: +# # CSFLE crypt_shared is available from MongoDB 6.0+ +# - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } +# tasks: +# - name: "test-skip_crypt_shared" From 8f99925fb9d3d6573d8647f5ce8504ceaa982ded Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 19 Sep 2023 08:15:55 +0200 Subject: [PATCH 04/44] Add make target to test without building This is necessary if we don't want to change all `.dep` files to the new path. --- .evergreen/run-tests.sh | 2 +- Makefile.frag | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 996a022b4..662b974e3 100755 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -45,4 +45,4 @@ SSL_DIR="${SSL_DIR}" \ TEST_PHP_JUNIT="${PROJECT_DIRECTORY}/test-results.xml" \ TEST_PHP_ARGS="-q -x --show-diff -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP" \ TESTS="$TESTS" \ -make test +make test-no-build diff --git a/Makefile.frag b/Makefile.frag index 6c69049b1..4800ffe6b 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -88,3 +88,27 @@ generate-function-map: all else \ echo "ERROR: Cannot generate function maps without CLI sapi."; \ fi + +test-no-build: + @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ + INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ + if test "$$INI_FILE"; then \ + $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \ + if test "$$INI_SCANNED_PATH"; then \ + INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \ + $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \ + fi; \ + TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ + CC="$(CC)" \ + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + TEST_RESULT_EXIT_CODE=$$?; \ + rm $(top_builddir)/tmp-php.ini; \ + exit $$TEST_RESULT_EXIT_CODE; \ + else \ + echo "ERROR: Cannot run tests without CLI sapi."; \ + fi From 16b8e4449cf66d41dfbd87a51422d8d9f0e315d5 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 19 Sep 2023 08:17:21 +0200 Subject: [PATCH 05/44] Cache compiled build for later use --- .evergreen/config.yml | 114 +++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 63 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index fcd3109d0..19a06d8e7 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -148,39 +148,47 @@ functions: # Compress and upload the entire build directory - command: archive.targz_pack params: - # Example: mongo_c_driver_releng_9dfb7d741efbca16faa7859b9349d7a942273e43_16_11_08_19_29_52.tar.gz target: "${build_id}.tar.gz" - source_dir: ${PROJECT_DIRECTORY}/ + source_dir: src include: - "./**" - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: ${build_id}.tar.gz - # Example: /mciuploads/${UPLOAD_BUCKET}/gcc49/9dfb7d741efbca16faa7859b9349d7a942273e43/debug-compile-nosasl-nossl/mongo_c_driver_releng_9dfb7d741efbca16faa7859b9349d7a942273e43_16_11_08_19_29_52.tar.gz - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz bucket: mciuploads - permissions: public-read content_type: ${content_type|application/x-gzip} + permissions: public-read + local_file: ${build_id}.tar.gz + remote_file: ${project}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz "fetch build": - - command: shell.exec + - command: subprocess.exec + type: setup params: - continue_on_err: true - script: "rm -rf ${PROJECT_DIRECTORY}" + binary: bash + args: + - -c + - rm -rf src - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz bucket: mciuploads + remote_file: ${project}/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz local_file: build.tar.gz + - command: archive.targz_extract + params: + destination: src + path: build.tar.gz + # Fix path names in Makefile - command: shell.exec + type: test params: - continue_on_err: true - # EVG-1105: Use s3.get extract_to: ./ - script: "cd .. && rm -rf ${PROJECT_DIRECTORY} && mkdir ${PROJECT_DIRECTORY}/ && tar xf build.tar.gz -C ${PROJECT_DIRECTORY}/" + working_dir: "src" + script: | + ${PREPARE_SHELL} + perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" Makefile "compile driver" : - command: shell.exec @@ -401,6 +409,13 @@ functions: ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop fi +tasks: + - name: "build" + tags: ["build"] + commands: + - func: "compile driver" + - func: "upload build" + # # Tasks for local deployments # @@ -409,7 +424,6 @@ functions: - name: "test-mongodb-latest-standalone" tags: ["standalone"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -418,7 +432,6 @@ functions: - name: "test-mongodb-latest-standalone-auth" tags: ["standalone"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -428,7 +441,6 @@ functions: - name: "test-mongodb-latest-standalone-ssl" tags: ["standalone"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -440,7 +452,6 @@ functions: - name: "test-mongodb-latest-replicaset" tags: ["replicaset"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -449,7 +460,6 @@ functions: - name: "test-mongodb-latest-replicaset-auth" tags: ["replicaset"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -459,7 +469,6 @@ functions: - name: "test-mongodb-latest-sharded" tags: ["sharded"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" @@ -470,7 +479,6 @@ functions: - name: "test-mongodb-rapid-standalone" tags: ["standalone"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -479,7 +487,6 @@ functions: - name: "test-mongodb-rapid-standalone-auth" tags: ["standalone"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -489,7 +496,6 @@ functions: - name: "test-mongodb-rapid-standalone-ssl" tags: ["standalone"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -501,7 +507,6 @@ functions: - name: "test-mongodb-rapid-replicaset" tags: ["replicaset"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -510,7 +515,6 @@ functions: - name: "test-mongodb-rapid-replicaset-auth" tags: ["replicaset"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -520,7 +524,6 @@ functions: - name: "test-mongodb-rapid-sharded" tags: ["sharded"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" @@ -531,7 +534,6 @@ functions: - name: "test-mongodb-70-standalone" tags: ["standalone", "7.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -540,7 +542,6 @@ functions: - name: "test-mongodb-70-standalone-auth" tags: ["standalone", "7.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -550,7 +551,6 @@ functions: - name: "test-mongodb-70-standalone-ssl" tags: ["standalone", "7.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -562,7 +562,6 @@ functions: - name: "test-mongodb-70-replicaset" tags: ["replicaset", "7.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -571,7 +570,6 @@ functions: - name: "test-mongodb-70-replicaset-auth" tags: ["replicaset", "7.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -581,7 +579,6 @@ functions: - name: "test-mongodb-70-sharded" tags: ["sharded", "7.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" @@ -592,7 +589,6 @@ functions: - name: "test-mongodb-60-standalone" tags: ["standalone", "6.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -601,7 +597,6 @@ functions: - name: "test-mongodb-60-standalone-auth" tags: ["standalone", "6.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -611,7 +606,6 @@ functions: - name: "test-mongodb-60-standalone-ssl" tags: ["standalone", "6.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -623,7 +617,6 @@ functions: - name: "test-mongodb-60-replicaset" tags: ["replicaset", "6.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -632,7 +625,6 @@ functions: - name: "test-mongodb-60-replicaset-auth" tags: ["replicaset", "6.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -642,7 +634,6 @@ functions: - name: "test-mongodb-60-sharded" tags: ["sharded", "6.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" @@ -653,7 +644,6 @@ functions: - name: "test-mongodb-50-standalone" tags: ["standalone", "5.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -662,7 +652,6 @@ functions: - name: "test-mongodb-50-standalone-auth" tags: ["standalone", "5.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -672,7 +661,6 @@ functions: - name: "test-mongodb-50-standalone-ssl" tags: ["standalone", "5.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -684,7 +672,6 @@ functions: - name: "test-mongodb-50-replicaset" tags: ["replicaset", "5.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -693,7 +680,6 @@ functions: - name: "test-mongodb-50-replicaset-auth" tags: ["replicaset", "5.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -703,7 +689,6 @@ functions: - name: "test-mongodb-50-sharded" tags: ["sharded", "5.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" @@ -714,7 +699,6 @@ functions: - name: "test-mongodb-44-standalone" tags: ["standalone", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -723,7 +707,6 @@ functions: - name: "test-mongodb-44-standalone-auth" tags: ["standalone", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -733,7 +716,6 @@ functions: - name: "test-mongodb-44-standalone-ssl" tags: ["standalone", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -745,7 +727,6 @@ functions: - name: "test-mongodb-44-replicaset" tags: ["replicaset", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -754,7 +735,6 @@ functions: - name: "test-mongodb-44-replicaset-auth" tags: ["replicaset", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -764,7 +744,6 @@ functions: - name: "test-mongodb-44-sharded" tags: ["sharded", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" @@ -775,7 +754,6 @@ functions: - name: "test-mongodb-42-standalone" tags: ["standalone", "4.2"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -784,7 +762,6 @@ functions: - name: "test-mongodb-42-standalone-auth" tags: ["standalone", "4.2"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -794,7 +771,6 @@ functions: - name: "test-mongodb-42-standalone-ssl" tags: ["standalone", "4.2"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -806,7 +782,6 @@ functions: - name: "test-mongodb-42-replicaset" tags: ["replicaset", "4.2"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -815,7 +790,6 @@ functions: - name: "test-mongodb-42-replicaset-auth" tags: ["replicaset", "4.2"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -825,7 +799,6 @@ functions: - name: "test-mongodb-42-sharded" tags: ["sharded", "4.2"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" @@ -836,7 +809,6 @@ functions: - name: "test-mongodb-40-standalone" tags: ["standalone", "4.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -845,7 +817,6 @@ functions: - name: "test-mongodb-40-standalone-auth" tags: ["standalone", "4.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -855,7 +826,6 @@ functions: - name: "test-mongodb-40-standalone-ssl" tags: ["standalone", "4.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -867,7 +837,6 @@ functions: - name: "test-mongodb-40-replicaset" tags: ["replicaset", "4.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -876,7 +845,6 @@ functions: - name: "test-mongodb-40-replicaset-auth" tags: ["replicaset", "4.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -886,7 +854,6 @@ functions: - name: "test-mongodb-40-sharded" tags: ["sharded", "4.0"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" @@ -1397,7 +1364,23 @@ functions: APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" task_groups: - - name: test-local-deployment + - name: "build-extension" + setup_group: + - func: "fetch source" + - func: "prepare resources" + - func: "windows fix" + - func: "fix absolute paths" + - func: "make files executable" + - func: "install dependencies" + teardown_group: + - func: "upload working dir" + - func: "cleanup" + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - "build" + + - name: "test-local-deployment" setup_group: - func: "fetch source" - func: "prepare resources" @@ -1406,11 +1389,13 @@ task_groups: - func: "init test-results" - func: "make files executable" - func: "install dependencies" + - func: "fetch build" + vars: + BUILD_NAME: "build" teardown_group: - func: "upload working dir" - func: "upload mo artifacts" - func: "upload test results" - - func: "stop load balancer" - func: "stop mongo-orchestration" - func: "cleanup" setup_group_can_fail_task: true @@ -1599,7 +1584,10 @@ buildvariants: variables: PHP_VERSION: "8.2" tasks: + - name: "build-extension" - name: "test-local-deployment" + depends_on: + - name: "build" # # Old build variants preserved below From 7a4b1777c7ff86ab9f09b33645aa5fa070bd7c66 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 19 Sep 2023 08:32:28 +0200 Subject: [PATCH 06/44] Rename tasks for better filtering --- .evergreen/config.yml | 96 +++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 19a06d8e7..b4b2e886e 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -421,7 +421,7 @@ tasks: # # MongoDB latest - - name: "test-mongodb-latest-standalone" + - name: "test-mongodb-latest-standalone-noauth-nossl" tags: ["standalone"] commands: - func: "bootstrap mongo-orchestration" @@ -449,7 +449,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-latest-replicaset" + - name: "test-mongodb-latest-replicaset-noauth-nossl" tags: ["replicaset"] commands: - func: "bootstrap mongo-orchestration" @@ -466,7 +466,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "latest" - func: "run tests" - - name: "test-mongodb-latest-sharded" + - name: "test-mongodb-latest-sharded-noauth-nossl" tags: ["sharded"] commands: - func: "bootstrap mongo-orchestration" @@ -476,7 +476,7 @@ tasks: - func: "run tests" # MongoDB Rapid Release - - name: "test-mongodb-rapid-standalone" + - name: "test-mongodb-rapid-standalone-noauth-nossl" tags: ["standalone"] commands: - func: "bootstrap mongo-orchestration" @@ -504,7 +504,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-rapid-replicaset" + - name: "test-mongodb-rapid-replicaset-noauth-nossl" tags: ["replicaset"] commands: - func: "bootstrap mongo-orchestration" @@ -521,7 +521,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "rapid" - func: "run tests" - - name: "test-mongodb-rapid-sharded" + - name: "test-mongodb-rapid-sharded-noauth-nossl" tags: ["sharded"] commands: - func: "bootstrap mongo-orchestration" @@ -531,7 +531,7 @@ tasks: - func: "run tests" # MongoDB 7.0 - - name: "test-mongodb-70-standalone" + - name: "test-mongodb-7.0-standalone-noauth-nossl" tags: ["standalone", "7.0"] commands: - func: "bootstrap mongo-orchestration" @@ -539,7 +539,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "7.0" - func: "run tests" - - name: "test-mongodb-70-standalone-auth" + - name: "test-mongodb-7.0-standalone-auth" tags: ["standalone", "7.0"] commands: - func: "bootstrap mongo-orchestration" @@ -548,7 +548,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "7.0" - func: "run tests" - - name: "test-mongodb-70-standalone-ssl" + - name: "test-mongodb-7.0-standalone-ssl" tags: ["standalone", "7.0"] commands: - func: "bootstrap mongo-orchestration" @@ -559,7 +559,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-70-replicaset" + - name: "test-mongodb-7.0-replicaset-noauth-nossl" tags: ["replicaset", "7.0"] commands: - func: "bootstrap mongo-orchestration" @@ -567,7 +567,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "7.0" - func: "run tests" - - name: "test-mongodb-70-replicaset-auth" + - name: "test-mongodb-7.0-replicaset-auth" tags: ["replicaset", "7.0"] commands: - func: "bootstrap mongo-orchestration" @@ -576,7 +576,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "7.0" - func: "run tests" - - name: "test-mongodb-70-sharded" + - name: "test-mongodb-7.0-sharded-noauth-nossl" tags: ["sharded", "7.0"] commands: - func: "bootstrap mongo-orchestration" @@ -586,7 +586,7 @@ tasks: - func: "run tests" # MongoDB 6.0 - - name: "test-mongodb-60-standalone" + - name: "test-mongodb-6.0-standalone-noauth-nossl" tags: ["standalone", "6.0"] commands: - func: "bootstrap mongo-orchestration" @@ -594,7 +594,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "6.0" - func: "run tests" - - name: "test-mongodb-60-standalone-auth" + - name: "test-mongodb-6.0-standalone-auth" tags: ["standalone", "6.0"] commands: - func: "bootstrap mongo-orchestration" @@ -603,7 +603,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "6.0" - func: "run tests" - - name: "test-mongodb-60-standalone-ssl" + - name: "test-mongodb-6.0-standalone-ssl" tags: ["standalone", "6.0"] commands: - func: "bootstrap mongo-orchestration" @@ -614,7 +614,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-60-replicaset" + - name: "test-mongodb-6.0-replicaset-noauth-nossl" tags: ["replicaset", "6.0"] commands: - func: "bootstrap mongo-orchestration" @@ -622,7 +622,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "6.0" - func: "run tests" - - name: "test-mongodb-60-replicaset-auth" + - name: "test-mongodb-6.0-replicaset-auth" tags: ["replicaset", "6.0"] commands: - func: "bootstrap mongo-orchestration" @@ -631,7 +631,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "6.0" - func: "run tests" - - name: "test-mongodb-60-sharded" + - name: "test-mongodb-6.0-sharded-noauth-nossl" tags: ["sharded", "6.0"] commands: - func: "bootstrap mongo-orchestration" @@ -641,7 +641,7 @@ tasks: - func: "run tests" # MongoDB 5.0 - - name: "test-mongodb-50-standalone" + - name: "test-mongodb-5.0-standalone-noauth-nossl" tags: ["standalone", "5.0"] commands: - func: "bootstrap mongo-orchestration" @@ -649,7 +649,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "5.0" - func: "run tests" - - name: "test-mongodb-50-standalone-auth" + - name: "test-mongodb-5.0-standalone-auth" tags: ["standalone", "5.0"] commands: - func: "bootstrap mongo-orchestration" @@ -658,7 +658,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "5.0" - func: "run tests" - - name: "test-mongodb-50-standalone-ssl" + - name: "test-mongodb-5.0-standalone-ssl" tags: ["standalone", "5.0"] commands: - func: "bootstrap mongo-orchestration" @@ -669,7 +669,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-50-replicaset" + - name: "test-mongodb-5.0-replicaset-noauth-nossl" tags: ["replicaset", "5.0"] commands: - func: "bootstrap mongo-orchestration" @@ -677,7 +677,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "5.0" - func: "run tests" - - name: "test-mongodb-50-replicaset-auth" + - name: "test-mongodb-5.0-replicaset-auth" tags: ["replicaset", "5.0"] commands: - func: "bootstrap mongo-orchestration" @@ -686,7 +686,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "5.0" - func: "run tests" - - name: "test-mongodb-50-sharded" + - name: "test-mongodb-5.0-sharded-noauth-nossl" tags: ["sharded", "5.0"] commands: - func: "bootstrap mongo-orchestration" @@ -696,7 +696,7 @@ tasks: - func: "run tests" # MongoDB 4.4 - - name: "test-mongodb-44-standalone" + - name: "test-mongodb-4.4-standalone-noauth-nossl" tags: ["standalone", "4.4"] commands: - func: "bootstrap mongo-orchestration" @@ -704,7 +704,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "4.4" - func: "run tests" - - name: "test-mongodb-44-standalone-auth" + - name: "test-mongodb-4.4-standalone-auth" tags: ["standalone", "4.4"] commands: - func: "bootstrap mongo-orchestration" @@ -713,7 +713,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.4" - func: "run tests" - - name: "test-mongodb-44-standalone-ssl" + - name: "test-mongodb-4.4-standalone-ssl" tags: ["standalone", "4.4"] commands: - func: "bootstrap mongo-orchestration" @@ -724,7 +724,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-44-replicaset" + - name: "test-mongodb-4.4-replicaset-noauth-nossl" tags: ["replicaset", "4.4"] commands: - func: "bootstrap mongo-orchestration" @@ -732,7 +732,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "4.4" - func: "run tests" - - name: "test-mongodb-44-replicaset-auth" + - name: "test-mongodb-4.4-replicaset-auth" tags: ["replicaset", "4.4"] commands: - func: "bootstrap mongo-orchestration" @@ -741,7 +741,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.4" - func: "run tests" - - name: "test-mongodb-44-sharded" + - name: "test-mongodb-4.4-sharded-noauth-nossl" tags: ["sharded", "4.4"] commands: - func: "bootstrap mongo-orchestration" @@ -751,7 +751,7 @@ tasks: - func: "run tests" # MongoDB 4.2 - - name: "test-mongodb-42-standalone" + - name: "test-mongodb-4.2-standalone-noauth-nossl" tags: ["standalone", "4.2"] commands: - func: "bootstrap mongo-orchestration" @@ -759,7 +759,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "4.2" - func: "run tests" - - name: "test-mongodb-42-standalone-auth" + - name: "test-mongodb-4.2-standalone-auth" tags: ["standalone", "4.2"] commands: - func: "bootstrap mongo-orchestration" @@ -768,7 +768,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.2" - func: "run tests" - - name: "test-mongodb-42-standalone-ssl" + - name: "test-mongodb-4.2-standalone-ssl" tags: ["standalone", "4.2"] commands: - func: "bootstrap mongo-orchestration" @@ -779,7 +779,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-42-replicaset" + - name: "test-mongodb-4.2-replicaset-noauth-nossl" tags: ["replicaset", "4.2"] commands: - func: "bootstrap mongo-orchestration" @@ -787,7 +787,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "4.2" - func: "run tests" - - name: "test-mongodb-42-replicaset-auth" + - name: "test-mongodb-4.2-replicaset-auth" tags: ["replicaset", "4.2"] commands: - func: "bootstrap mongo-orchestration" @@ -796,7 +796,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.2" - func: "run tests" - - name: "test-mongodb-42-sharded" + - name: "test-mongodb-4.2-sharded-noauth-nossl" tags: ["sharded", "4.2"] commands: - func: "bootstrap mongo-orchestration" @@ -806,7 +806,7 @@ tasks: - func: "run tests" # MongoDB 4.0 - - name: "test-mongodb-40-standalone" + - name: "test-mongodb-4.0-standalone-noauth-nossl" tags: ["standalone", "4.0"] commands: - func: "bootstrap mongo-orchestration" @@ -814,7 +814,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "4.0" - func: "run tests" - - name: "test-mongodb-40-standalone-auth" + - name: "test-mongodb-4.0-standalone-auth" tags: ["standalone", "4.0"] commands: - func: "bootstrap mongo-orchestration" @@ -823,7 +823,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.0" - func: "run tests" - - name: "test-mongodb-40-standalone-ssl" + - name: "test-mongodb-4.0-standalone-ssl" tags: ["standalone", "4.0"] commands: - func: "bootstrap mongo-orchestration" @@ -834,7 +834,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-40-replicaset" + - name: "test-mongodb-4.0-replicaset-noauth-nossl" tags: ["replicaset", "4.0"] commands: - func: "bootstrap mongo-orchestration" @@ -842,7 +842,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "4.0" - func: "run tests" - - name: "test-mongodb-40-replicaset-auth" + - name: "test-mongodb-4.0-replicaset-auth" tags: ["replicaset", "4.0"] commands: - func: "bootstrap mongo-orchestration" @@ -851,7 +851,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.0" - func: "run tests" - - name: "test-mongodb-40-sharded" + - name: "test-mongodb-4.0-sharded-noauth-nossl" tags: ["sharded", "4.0"] commands: - func: "bootstrap mongo-orchestration" @@ -861,7 +861,7 @@ tasks: - func: "run tests" # MongoDB 3.6 - - name: "test-mongodb-36-standalone" + - name: "test-mongodb-3.6-standalone-noauth-nossl" tags: ["standalone", "3.6"] commands: - func: "compile driver" @@ -870,7 +870,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "3.6" - func: "run tests" - - name: "test-mongodb-36-standalone-auth" + - name: "test-mongodb-3.6-standalone-auth" tags: ["standalone", "3.6"] commands: - func: "compile driver" @@ -880,7 +880,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "3.6" - func: "run tests" - - name: "test-mongodb-36-standalone-ssl" + - name: "test-mongodb-3.6-standalone-ssl" tags: ["standalone", "3.6"] commands: - func: "compile driver" @@ -892,7 +892,7 @@ tasks: - func: "run tests" vars: SSL: "yes" - - name: "test-mongodb-36-replicaset" + - name: "test-mongodb-3.6-replicaset-noauth-nossl" tags: ["replicaset", "3.6"] commands: - func: "compile driver" @@ -901,7 +901,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "3.6" - func: "run tests" - - name: "test-mongodb-36-replicaset-auth" + - name: "test-mongodb-3.6-replicaset-auth" tags: ["replicaset", "3.6"] commands: - func: "compile driver" @@ -911,7 +911,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "3.6" - func: "run tests" - - name: "test-mongodb-36-sharded" + - name: "test-mongodb-3.6-sharded-noauth-nossl" tags: ["sharded", "3.6"] commands: - func: "compile driver" From 038ec066e1f5e033babf24902122da515520035e Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 19 Sep 2023 08:32:48 +0200 Subject: [PATCH 07/44] Remove working dir upload as it's already uploaded along with the build --- .evergreen/config.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index b4b2e886e..ee2bd9c38 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -248,16 +248,6 @@ functions: source_dir: ${PROJECT_DIRECTORY}/ include: - "./**" - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: working-dir.tar.gz - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/artifacts/${task_id}-${execution}-working-dir.tar.gz - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/x-gzip} - display_name: "working-dir.tar.gz" - command: archive.targz_pack params: target: "drivers-dir.tar.gz" From d8dbc3df3f682742636a87769dc3a2ad91ef72cc Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 19 Sep 2023 14:16:29 +0200 Subject: [PATCH 08/44] Update tags in test tasks --- .evergreen/config.yml | 119 +++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 64 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ee2bd9c38..d14aae36c 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -48,9 +48,6 @@ functions: git checkout ${LIBMONGOC_VERSION} # Note: compile-unix.sh will run `make libmongoc-version-current` fi - # Applies the submitted patch, if any - # Deprecated. Should be removed. But still needed for certain agents (ZAP) - - command: git.apply_patch # Make an evergreen expansion file with dynamic values - command: shell.exec params: @@ -407,12 +404,12 @@ tasks: - func: "upload build" # - # Tasks for local deployments + # Tasks for testing local deployments # # MongoDB latest - name: "test-mongodb-latest-standalone-noauth-nossl" - tags: ["standalone"] + tags: ["standalone", "local", "latest"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -420,7 +417,7 @@ tasks: MONGODB_VERSION: "latest" - func: "run tests" - name: "test-mongodb-latest-standalone-auth" - tags: ["standalone"] + tags: ["standalone", "local", "latest"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -429,7 +426,7 @@ tasks: MONGODB_VERSION: "latest" - func: "run tests" - name: "test-mongodb-latest-standalone-ssl" - tags: ["standalone"] + tags: ["standalone", "local", "latest"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -440,7 +437,7 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-latest-replicaset-noauth-nossl" - tags: ["replicaset"] + tags: ["replicaset", "local", "latest"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -448,7 +445,7 @@ tasks: MONGODB_VERSION: "latest" - func: "run tests" - name: "test-mongodb-latest-replicaset-auth" - tags: ["replicaset"] + tags: ["replicaset", "local", "latest"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -457,7 +454,7 @@ tasks: MONGODB_VERSION: "latest" - func: "run tests" - name: "test-mongodb-latest-sharded-noauth-nossl" - tags: ["sharded"] + tags: ["sharded", "local", "latest"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -467,7 +464,7 @@ tasks: # MongoDB Rapid Release - name: "test-mongodb-rapid-standalone-noauth-nossl" - tags: ["standalone"] + tags: ["standalone", "local", "rapid"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -475,7 +472,7 @@ tasks: MONGODB_VERSION: "rapid" - func: "run tests" - name: "test-mongodb-rapid-standalone-auth" - tags: ["standalone"] + tags: ["standalone", "local", "rapid"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -484,7 +481,7 @@ tasks: MONGODB_VERSION: "rapid" - func: "run tests" - name: "test-mongodb-rapid-standalone-ssl" - tags: ["standalone"] + tags: ["standalone", "local", "rapid"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -495,7 +492,7 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-rapid-replicaset-noauth-nossl" - tags: ["replicaset"] + tags: ["replicaset", "local", "rapid"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -503,7 +500,7 @@ tasks: MONGODB_VERSION: "rapid" - func: "run tests" - name: "test-mongodb-rapid-replicaset-auth" - tags: ["replicaset"] + tags: ["replicaset", "local", "rapid"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -512,7 +509,7 @@ tasks: MONGODB_VERSION: "rapid" - func: "run tests" - name: "test-mongodb-rapid-sharded-noauth-nossl" - tags: ["sharded"] + tags: ["sharded", "local", "rapid"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -522,7 +519,7 @@ tasks: # MongoDB 7.0 - name: "test-mongodb-7.0-standalone-noauth-nossl" - tags: ["standalone", "7.0"] + tags: ["standalone", "local", "7.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -530,7 +527,7 @@ tasks: MONGODB_VERSION: "7.0" - func: "run tests" - name: "test-mongodb-7.0-standalone-auth" - tags: ["standalone", "7.0"] + tags: ["standalone", "local", "7.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -539,7 +536,7 @@ tasks: MONGODB_VERSION: "7.0" - func: "run tests" - name: "test-mongodb-7.0-standalone-ssl" - tags: ["standalone", "7.0"] + tags: ["standalone", "local", "7.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -550,7 +547,7 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-7.0-replicaset-noauth-nossl" - tags: ["replicaset", "7.0"] + tags: ["replicaset", "local", "7.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -558,7 +555,7 @@ tasks: MONGODB_VERSION: "7.0" - func: "run tests" - name: "test-mongodb-7.0-replicaset-auth" - tags: ["replicaset", "7.0"] + tags: ["replicaset", "local", "7.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -567,7 +564,7 @@ tasks: MONGODB_VERSION: "7.0" - func: "run tests" - name: "test-mongodb-7.0-sharded-noauth-nossl" - tags: ["sharded", "7.0"] + tags: ["sharded", "local", "7.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -577,7 +574,7 @@ tasks: # MongoDB 6.0 - name: "test-mongodb-6.0-standalone-noauth-nossl" - tags: ["standalone", "6.0"] + tags: ["standalone", "local", "6.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -585,7 +582,7 @@ tasks: MONGODB_VERSION: "6.0" - func: "run tests" - name: "test-mongodb-6.0-standalone-auth" - tags: ["standalone", "6.0"] + tags: ["standalone", "local", "6.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -594,7 +591,7 @@ tasks: MONGODB_VERSION: "6.0" - func: "run tests" - name: "test-mongodb-6.0-standalone-ssl" - tags: ["standalone", "6.0"] + tags: ["standalone", "local", "6.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -605,7 +602,7 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-6.0-replicaset-noauth-nossl" - tags: ["replicaset", "6.0"] + tags: ["replicaset", "local", "6.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -613,7 +610,7 @@ tasks: MONGODB_VERSION: "6.0" - func: "run tests" - name: "test-mongodb-6.0-replicaset-auth" - tags: ["replicaset", "6.0"] + tags: ["replicaset", "local", "6.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -622,7 +619,7 @@ tasks: MONGODB_VERSION: "6.0" - func: "run tests" - name: "test-mongodb-6.0-sharded-noauth-nossl" - tags: ["sharded", "6.0"] + tags: ["sharded", "local", "6.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -632,7 +629,7 @@ tasks: # MongoDB 5.0 - name: "test-mongodb-5.0-standalone-noauth-nossl" - tags: ["standalone", "5.0"] + tags: ["standalone", "local", "5.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -640,7 +637,7 @@ tasks: MONGODB_VERSION: "5.0" - func: "run tests" - name: "test-mongodb-5.0-standalone-auth" - tags: ["standalone", "5.0"] + tags: ["standalone", "local", "5.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -649,7 +646,7 @@ tasks: MONGODB_VERSION: "5.0" - func: "run tests" - name: "test-mongodb-5.0-standalone-ssl" - tags: ["standalone", "5.0"] + tags: ["standalone", "local", "5.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -660,7 +657,7 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-5.0-replicaset-noauth-nossl" - tags: ["replicaset", "5.0"] + tags: ["replicaset", "local", "5.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -668,7 +665,7 @@ tasks: MONGODB_VERSION: "5.0" - func: "run tests" - name: "test-mongodb-5.0-replicaset-auth" - tags: ["replicaset", "5.0"] + tags: ["replicaset", "local", "5.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -677,7 +674,7 @@ tasks: MONGODB_VERSION: "5.0" - func: "run tests" - name: "test-mongodb-5.0-sharded-noauth-nossl" - tags: ["sharded", "5.0"] + tags: ["sharded", "local", "5.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -687,7 +684,7 @@ tasks: # MongoDB 4.4 - name: "test-mongodb-4.4-standalone-noauth-nossl" - tags: ["standalone", "4.4"] + tags: ["standalone", "local", "4.4"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -695,7 +692,7 @@ tasks: MONGODB_VERSION: "4.4" - func: "run tests" - name: "test-mongodb-4.4-standalone-auth" - tags: ["standalone", "4.4"] + tags: ["standalone", "local", "4.4"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -704,7 +701,7 @@ tasks: MONGODB_VERSION: "4.4" - func: "run tests" - name: "test-mongodb-4.4-standalone-ssl" - tags: ["standalone", "4.4"] + tags: ["standalone", "local", "4.4"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -715,7 +712,7 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-4.4-replicaset-noauth-nossl" - tags: ["replicaset", "4.4"] + tags: ["replicaset", "local", "4.4"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -723,7 +720,7 @@ tasks: MONGODB_VERSION: "4.4" - func: "run tests" - name: "test-mongodb-4.4-replicaset-auth" - tags: ["replicaset", "4.4"] + tags: ["replicaset", "local", "4.4"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -732,7 +729,7 @@ tasks: MONGODB_VERSION: "4.4" - func: "run tests" - name: "test-mongodb-4.4-sharded-noauth-nossl" - tags: ["sharded", "4.4"] + tags: ["sharded", "local", "4.4"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -742,7 +739,7 @@ tasks: # MongoDB 4.2 - name: "test-mongodb-4.2-standalone-noauth-nossl" - tags: ["standalone", "4.2"] + tags: ["standalone", "local", "4.2"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -750,7 +747,7 @@ tasks: MONGODB_VERSION: "4.2" - func: "run tests" - name: "test-mongodb-4.2-standalone-auth" - tags: ["standalone", "4.2"] + tags: ["standalone", "local", "4.2"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -759,7 +756,7 @@ tasks: MONGODB_VERSION: "4.2" - func: "run tests" - name: "test-mongodb-4.2-standalone-ssl" - tags: ["standalone", "4.2"] + tags: ["standalone", "local", "4.2"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -770,7 +767,7 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-4.2-replicaset-noauth-nossl" - tags: ["replicaset", "4.2"] + tags: ["replicaset", "local", "4.2"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -778,7 +775,7 @@ tasks: MONGODB_VERSION: "4.2" - func: "run tests" - name: "test-mongodb-4.2-replicaset-auth" - tags: ["replicaset", "4.2"] + tags: ["replicaset", "local", "4.2"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -787,7 +784,7 @@ tasks: MONGODB_VERSION: "4.2" - func: "run tests" - name: "test-mongodb-4.2-sharded-noauth-nossl" - tags: ["sharded", "4.2"] + tags: ["sharded", "local", "4.2"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -797,7 +794,7 @@ tasks: # MongoDB 4.0 - name: "test-mongodb-4.0-standalone-noauth-nossl" - tags: ["standalone", "4.0"] + tags: ["standalone", "local", "4.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -805,7 +802,7 @@ tasks: MONGODB_VERSION: "4.0" - func: "run tests" - name: "test-mongodb-4.0-standalone-auth" - tags: ["standalone", "4.0"] + tags: ["standalone", "local", "4.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -814,7 +811,7 @@ tasks: MONGODB_VERSION: "4.0" - func: "run tests" - name: "test-mongodb-4.0-standalone-ssl" - tags: ["standalone", "4.0"] + tags: ["standalone", "local", "4.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -825,7 +822,7 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-4.0-replicaset-noauth-nossl" - tags: ["replicaset", "4.0"] + tags: ["replicaset", "local", "4.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -833,7 +830,7 @@ tasks: MONGODB_VERSION: "4.0" - func: "run tests" - name: "test-mongodb-4.0-replicaset-auth" - tags: ["replicaset", "4.0"] + tags: ["replicaset", "local", "4.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -842,7 +839,7 @@ tasks: MONGODB_VERSION: "4.0" - func: "run tests" - name: "test-mongodb-4.0-sharded-noauth-nossl" - tags: ["sharded", "4.0"] + tags: ["sharded", "local", "4.0"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -852,18 +849,16 @@ tasks: # MongoDB 3.6 - name: "test-mongodb-3.6-standalone-noauth-nossl" - tags: ["standalone", "3.6"] + tags: ["standalone", "local", "3.6"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" MONGODB_VERSION: "3.6" - func: "run tests" - name: "test-mongodb-3.6-standalone-auth" - tags: ["standalone", "3.6"] + tags: ["standalone", "local", "3.6"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -871,9 +866,8 @@ tasks: MONGODB_VERSION: "3.6" - func: "run tests" - name: "test-mongodb-3.6-standalone-ssl" - tags: ["standalone", "3.6"] + tags: ["standalone", "local", "3.6"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "server" @@ -883,18 +877,16 @@ tasks: vars: SSL: "yes" - name: "test-mongodb-3.6-replicaset-noauth-nossl" - tags: ["replicaset", "3.6"] + tags: ["replicaset", "local", "3.6"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" MONGODB_VERSION: "3.6" - func: "run tests" - name: "test-mongodb-3.6-replicaset-auth" - tags: ["replicaset", "3.6"] + tags: ["replicaset", "local", "3.6"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "replica_set" @@ -902,9 +894,8 @@ tasks: MONGODB_VERSION: "3.6" - func: "run tests" - name: "test-mongodb-3.6-sharded-noauth-nossl" - tags: ["sharded", "3.6"] + tags: ["sharded", "local", "3.6"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: TOPOLOGY: "sharded_cluster" From a1311225d4b8de76ec68fb7d39e2e422d13db969 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 19 Sep 2023 14:17:34 +0200 Subject: [PATCH 09/44] Create build variants for building driver --- .evergreen/compile-unix.sh | 22 ++- .evergreen/config.yml | 281 +++++++++++++++++++------------------ 2 files changed, 162 insertions(+), 141 deletions(-) diff --git a/.evergreen/compile-unix.sh b/.evergreen/compile-unix.sh index e4d71b7b7..0c06a212c 100755 --- a/.evergreen/compile-unix.sh +++ b/.evergreen/compile-unix.sh @@ -1,6 +1,24 @@ -#!/bin/sh +#!/bin/bash set -o errexit # Exit the script with error if any of the commands fail +# Find PHP binary path for the requested version +if [ -z "$PHP_PATH" ]; then + if [ -d "/opt/php/${PHP_VERSION}-64bit/bin" ]; then + PHP_PATH="/opt/php/${PHP_VERSION}-64bit/bin" + else + # Try to find the newest version matching our constant + PHP_PATH=`find /opt/php/ -maxdepth 1 -type d -name "${PHP_VERSION}*-64bit" -print | sort -V -r | head -n 1`/bin + fi +fi + +if [ ! -x "$PHP_PATH/php" ]; then + echo "Could not find PHP binaries for version ${PHP_VERSION}. Listing available versions..." + ls -1 /opt/php + exit 1 +fi + +PATH="$PHP_PATH:$PATH" + # Supported/used environment variables: # MARCH Machine Architecture. Defaults to lowercase uname -m # LIBMONGOC_VERSION Optional libmongoc version (regenerate version file if set) @@ -45,7 +63,7 @@ case "$OS" in esac # Report the current PHP version -echo "PHP: `php --version | head -1`" +echo "PHP: `php --version | head -n 1`" phpize ./configure --enable-mongodb-developer-flags diff --git a/.evergreen/config.yml b/.evergreen/config.yml index d14aae36c..d67ce57ca 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -69,25 +69,11 @@ functions: export PROJECT_DIRECTORY=$(cygpath -m $PROJECT_DIRECTORY) fi - if [ -d "/opt/php/${PHP_VERSION}-64bit/bin" ]; then - PHP_PATH="/opt/php/${PHP_VERSION}-64bit/bin" - else - # Try to find the newest version matching our constant - PHP_PATH=`find /opt/php/ -maxdepth 1 -type d -name '${PHP_VERSION}*-64bit' -print | sort -V -r | head -1`/bin - fi - - if [ ! -d "$PHP_PATH" ]; then - echo "Could not find PHP binaries for version ${PHP_VERSION}. Listing available versions..." - ls -1 /opt/php - exit 1 - fi - export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration" # Note: PHPC no longer has any custom MO configs, but they can be stored here if needed export PROJECT_ORCHESTRATION_HOME="$PROJECT_DIRECTORY/.evergreen/orchestration" export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin" export UPLOAD_BUCKET="${project}" - export PHP_VERSION="${PHP_VERSION}" cat < expansion.yml CURRENT_VERSION: "$CURRENT_VERSION" @@ -108,10 +94,9 @@ functions: export PROJECT_DIRECTORY="$PROJECT_DIRECTORY" export TMPDIR="$MONGO_ORCHESTRATION_HOME/db" - export PATH="$PHP_PATH:$MONGODB_BINARIES:$PATH" + export PATH="$MONGODB_BINARIES:$PATH" export PROJECT="${project}" - export PHP_VERSION="$PHP_VERSION" export SSL_DIR="$DRIVERS_TOOLS/.evergreen/x509gen" export LIBMONGOC_VERSION="${LIBMONGOC_VERSION}" EOT @@ -188,13 +173,14 @@ functions: perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" Makefile "compile driver" : - - command: shell.exec + - command: subprocess.exec type: test params: working_dir: "src" - script: | - ${PREPARE_SHELL} - sh ${PROJECT_DIRECTORY}/.evergreen/compile-unix.sh + add_expansions_to_env: true + binary: bash + args: + - ${PROJECT_DIRECTORY}/.evergreen/compile-unix.sh "upload mo artifacts": - command: shell.exec @@ -397,10 +383,36 @@ functions: fi tasks: - - name: "build" - tags: ["build"] + - name: "build-php-8.2" + tags: ["build", "php8.2"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.2" + - func: "upload build" + + - name: "build-php-8.1" + tags: ["build", "php8.1"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.1" + - func: "upload build" + + - name: "build-php-8.0" + tags: ["build", "php8.0"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.0" + - func: "upload build" + + - name: "build-php-7.4" + tags: ["build", "php7.4"] commands: - func: "compile driver" + vars: + PHP_VERSION: "7.4" - func: "upload build" # @@ -1344,23 +1356,22 @@ tasks: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" -task_groups: - - name: "build-extension" - setup_group: - - func: "fetch source" - - func: "prepare resources" - - func: "windows fix" - - func: "fix absolute paths" - - func: "make files executable" - - func: "install dependencies" - teardown_group: - - func: "upload working dir" - - func: "cleanup" - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - "build" +# +# Pre and post are only used for variants that build; they are ignored when task groups are used +# +pre: + - func: "fetch source" + - func: "prepare resources" + - func: "windows fix" + - func: "fix absolute paths" + - func: "make files executable" + - func: "install dependencies" + +post: + - func: "upload working dir" + - func: "cleanup" +task_groups: - name: "test-local-deployment" setup_group: - func: "fetch source" @@ -1371,107 +1382,24 @@ task_groups: - func: "make files executable" - func: "install dependencies" - func: "fetch build" - vars: - BUILD_NAME: "build" +# vars: +# FETCH_BUILD_VARIANT: "${FETCH_BUILD_VARIANT}" +# FETCH_BUILD_TASK: "build-php-${PHP_VERSION}" teardown_group: - - func: "upload working dir" - func: "upload mo artifacts" - func: "upload test results" - func: "stop mongo-orchestration" + - func: "upload working dir" - func: "cleanup" setup_group_can_fail_task: true setup_group_timeout_secs: 1800 tasks: - - ".standalone" - - ".replicaset" - - ".sharded" + - ".standalone .local" + - ".replicaset .local" + - ".sharded .local" axes: - - id: mongodb-versions - display_name: MongoDB Version - values: - - id: "latest" - display_name: "MongoDB latest" - variables: - MONGODB_VERSION: "latest" - - id: "rapid" - display_name: "MongoDB rapid" - variables: - MONGODB_VERSION: "rapid" - - id: "7.0" - display_name: "MongoDB 7.0" - variables: - MONGODB_VERSION: "7.0" - - id: "6.0" - display_name: "MongoDB 6.0" - variables: - MONGODB_VERSION: "6.0" - - id: "5.0" - display_name: "MongoDB 5.0" - variables: - MONGODB_VERSION: "5.0" - - id: "4.4" - display_name: "MongoDB 4.4" - variables: - MONGODB_VERSION: "4.4" - - id: "4.2" - display_name: "MongoDB 4.2" - variables: - MONGODB_VERSION: "4.2" - - id: "4.0" - display_name: "MongoDB 4.0" - variables: - MONGODB_VERSION: "4.0" - - id: "3.6" - display_name: "MongoDB 3.6" - variables: - MONGODB_VERSION: "3.6" - - - id: mongodb-edge-versions - display_name: MongoDB Version - values: - - id: "latest-stable" - display_name: "MongoDB 6.0" - variables: - MONGODB_VERSION: "6.0" - - id: "oldest-supported" - display_name: "MongoDB 3.6" - variables: - MONGODB_VERSION: "3.6" - - - id: php-versions - display_name: PHP Version - values: - - id: "8.2" - display_name: "PHP 8.2" - variables: - PHP_VERSION: "8.2" - - id: "8.1" - display_name: "PHP 8.1" - variables: - PHP_VERSION: "8.1" - - id: "8.0" - display_name: "PHP 8.0" - variables: - PHP_VERSION: "8.0" - - id: "7.4" - display_name: "PHP 7.4" - variables: - PHP_VERSION: "7.4" - - - id: php-edge-versions - display_name: PHP Version - values: - - id: "latest-stable" - display_name: "PHP 8.2" - variables: - PHP_VERSION: "8.2" - - id: "oldest-supported" - display_name: "PHP 7.4" - variables: - PHP_VERSION: "7.4" - - id: os display_name: OS values: @@ -1520,11 +1448,6 @@ axes: display_name: "Ubuntu 20.04 ARM64" run_on: ubuntu2004-arm64-small - # Pending installation of PHP toolchain on macOS hosts (see: PHPC-869) - # - id: macos-1014 - # display_name: "Mac OS 10.14" - # run_on: macos-1014 - - id: storage-engine display_name: Storage values: @@ -1559,16 +1482,96 @@ axes: buildvariants: - - name: debian11-php82-local - display_name: Debian 11, PHP 8.2, Local + # + # Build variants to build the driver - these are run for all operating systems and PHP versions we support + # + + # Debian + - name: build-debian11 + display_name: "Build: Debian 11" + run_on: debian11-small + tasks: + - name: ".build" + - name: build-debian10 + display_name: "Build: Debian 10" + run_on: debian10-small + tasks: + - name: ".build" + - name: build-debian92 + display_name: "Build: Debian 9.2" + run_on: debian92-small + tasks: + - name: ".build" + + # RHEL + - name: build-rhel90 + display_name: "Build: RHEL 9.0" + run_on: rhel90-small + tasks: + - name: ".build !.php7.4 !.php8.0" + - name: build-rhel83-zseries + display_name: "Build: RHEL 8.3 Zseries" + run_on: rhel83-zseries-small + tasks: + - name: ".build" + - name: build-rhel82-arm64 + display_name: "Build: RHEL 8.2 ARM64" + run_on: rhel82-arm64 + tasks: + - name: ".build" + - name: build-rhel81-power8 + display_name: "Build: RHEL 8.1 Power8" + run_on: rhel81-power8-large + tasks: + - name: ".build" + - name: build-rhel80 + display_name: "Build: RHEL 8.0" + run_on: rhel80-small + tasks: + - name: ".build" + - name: build-rhel76 + display_name: "Build: RHEL 7.6" + run_on: rhel76-small + tasks: + - name: ".build" + + # Ubuntu LTS + - name: build-ubuntu2204 + display_name: "Build: Ubuntu 22.04 x64" + run_on: ubuntu2204-arm64 + tasks: + - name: ".build !.php7.4 !.php8.0" + - name: build-ubuntu2204-arm64 + display_name: "Build: Ubuntu 22.04 ARM64" + run_on: ubuntu2204-arm64-small + tasks: + - name: ".build !.php7.4 !.php8.0" + - name: build-ubuntu2004 + display_name: "Build: Ubuntu 20.04 x64" + run_on: ubuntu2004-arm64 + tasks: + - name: ".build" + - name: build-ubuntu2004-arm64 + display_name: "Build: Ubuntu 20.04 ARM64" + run_on: ubuntu2004-arm64-small + tasks: + - name: ".build" + + # + # Test variants - only run for select platforms worth testing on + # + - name: test-debian11-php82-local + display_name: "Test: Debian 11, PHP 8.2" run_on: debian11-small - variables: + expansions: PHP_VERSION: "8.2" + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.2" + depends_on: + - variant: "build-debian11" + name: "build-php-8.2" tasks: - - name: "build-extension" - name: "test-local-deployment" - depends_on: - - name: "build" # # Old build variants preserved below From 94660d503d9ea2c854fb098ed8e1aa5f46491934 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 19 Sep 2023 14:22:13 +0200 Subject: [PATCH 10/44] Fetch correct build file --- .evergreen/config.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index d67ce57ca..e38d25a18 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -142,7 +142,7 @@ functions: content_type: ${content_type|application/x-gzip} permissions: public-read local_file: ${build_id}.tar.gz - remote_file: ${project}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz + remote_file: ${project}/${build_variant}/${revision}/${task_name}/${version}.tar.gz "fetch build": - command: subprocess.exec @@ -157,7 +157,7 @@ functions: aws_key: ${aws_key} aws_secret: ${aws_secret} bucket: mciuploads - remote_file: ${project}/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz + remote_file: ${project}/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version}.tar.gz local_file: build.tar.gz - command: archive.targz_extract params: @@ -1372,7 +1372,7 @@ post: - func: "cleanup" task_groups: - - name: "test-local-deployment" + - name: "test-local-deployment-7.0" setup_group: - func: "fetch source" - func: "prepare resources" @@ -1382,9 +1382,6 @@ task_groups: - func: "make files executable" - func: "install dependencies" - func: "fetch build" -# vars: -# FETCH_BUILD_VARIANT: "${FETCH_BUILD_VARIANT}" -# FETCH_BUILD_TASK: "build-php-${PHP_VERSION}" teardown_group: - func: "upload mo artifacts" - func: "upload test results" @@ -1394,9 +1391,9 @@ task_groups: setup_group_can_fail_task: true setup_group_timeout_secs: 1800 tasks: - - ".standalone .local" - - ".replicaset .local" - - ".sharded .local" + - ".standalone .local .7.0" + - ".replicaset .local .7.0" + - ".sharded .local .7.0" axes: @@ -1564,14 +1561,13 @@ buildvariants: display_name: "Test: Debian 11, PHP 8.2" run_on: debian11-small expansions: - PHP_VERSION: "8.2" FETCH_BUILD_VARIANT: "build-debian11" FETCH_BUILD_TASK: "build-php-8.2" depends_on: - variant: "build-debian11" name: "build-php-8.2" tasks: - - name: "test-local-deployment" + - name: "test-local-deployment-7.0" # # Old build variants preserved below From 8a72a1904f28e9d5c5d5f2bc5f93efad6f36d20c Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 20 Sep 2023 09:41:13 +0200 Subject: [PATCH 11/44] Extract configuration to separate files --- .evergreen/config.yml | 1651 +----------------------- .evergreen/config/build-tasks.yml | 32 + .evergreen/config/build-variants.yml | 74 ++ .evergreen/config/functions.yml | 356 +++++ .evergreen/config/legacy-tasks.yml | 438 +++++++ .evergreen/config/legacy-variants.yml | 182 +++ .evergreen/config/test-task-groups.yml | 23 + .evergreen/config/test-tasks.yml | 495 +++++++ .evergreen/config/test-variants.yml | 15 + 9 files changed, 1622 insertions(+), 1644 deletions(-) create mode 100644 .evergreen/config/build-tasks.yml create mode 100644 .evergreen/config/build-variants.yml create mode 100644 .evergreen/config/functions.yml create mode 100644 .evergreen/config/legacy-tasks.yml create mode 100644 .evergreen/config/legacy-variants.yml create mode 100644 .evergreen/config/test-task-groups.yml create mode 100644 .evergreen/config/test-tasks.yml create mode 100644 .evergreen/config/test-variants.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index e38d25a18..bdce01ee6 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1,8 +1,3 @@ -######################################## -# Evergreen Template for MongoDB Drivers -# Modified for the PHP driver -######################################## - # When a task that used to pass starts to fail # Go through all versions that may have been skipped to detect # when the task started failing @@ -18,1344 +13,6 @@ command_type: system # That roughly accounts for variable system performance for various buildvariants exec_timeout_secs: 1800 # 6 minutes is the longest we'll ever run -# What to do when evergreen hits the timeout (`post:` tasks are run automatically) -timeout: - - command: shell.exec - params: - script: | - ls -la - -functions: - "fetch source": - # Executes git clone and applies the submitted patch, if any - - command: git.get_project - params: - directory: "src" - # Fetch the libmongoc submodule - - command: shell.exec - params: - working_dir: "src" - script: | - git submodule update --init - # Switch to a different version of libmongoc - - command: shell.exec - params: - working_dir: "src/src/libmongoc" - script: | - if [ -n "${LIBMONGOC_VERSION}" ]; then - echo "Checking out libmongoc version: ${LIBMONGOC_VERSION}" - git fetch - git checkout ${LIBMONGOC_VERSION} - # Note: compile-unix.sh will run `make libmongoc-version-current` - fi - # Make an evergreen expansion file with dynamic values - - command: shell.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)" - - # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory - if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin - export DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS) - export PROJECT_DIRECTORY=$(cygpath -m $PROJECT_DIRECTORY) - fi - - export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration" - # Note: PHPC no longer has any custom MO configs, but they can be stored here if needed - export PROJECT_ORCHESTRATION_HOME="$PROJECT_DIRECTORY/.evergreen/orchestration" - export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin" - export UPLOAD_BUCKET="${project}" - - cat < expansion.yml - CURRENT_VERSION: "$CURRENT_VERSION" - DRIVERS_TOOLS: "$DRIVERS_TOOLS" - MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME" - PROJECT_ORCHESTRATION_HOME: "$PROJECT_ORCHESTRATION_HOME" - MONGODB_BINARIES: "$MONGODB_BINARIES" - UPLOAD_BUCKET: "$UPLOAD_BUCKET" - PROJECT_DIRECTORY: "$PROJECT_DIRECTORY" - - PREPARE_SHELL: | - set -o errexit - export DRIVERS_TOOLS="$DRIVERS_TOOLS" - export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME" - export PROJECT_ORCHESTRATION_HOME="$PROJECT_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}" - - export SSL_DIR="$DRIVERS_TOOLS/.evergreen/x509gen" - export LIBMONGOC_VERSION="${LIBMONGOC_VERSION}" - EOT - # See what we've done - cat expansion.yml - - # 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} - rm -rf $DRIVERS_TOOLS - if [ "${project}" = "drivers-tools" ]; then - # If this was a patch build, doing a fresh clone would not actually test the patch - cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS - else - git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS - fi - echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config - - - # Upload build artifacts that other tasks may depend on - # Note this URL needs to be totally unique, while predictable for the next task - # so it can automatically download the artifacts - "upload build": - # Compress and upload the entire build directory - - command: archive.targz_pack - params: - target: "${build_id}.tar.gz" - source_dir: src - include: - - "./**" - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - bucket: mciuploads - content_type: ${content_type|application/x-gzip} - permissions: public-read - local_file: ${build_id}.tar.gz - remote_file: ${project}/${build_variant}/${revision}/${task_name}/${version}.tar.gz - - "fetch build": - - command: subprocess.exec - type: setup - params: - binary: bash - args: - - -c - - rm -rf src - - command: s3.get - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - bucket: mciuploads - remote_file: ${project}/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version}.tar.gz - local_file: build.tar.gz - - command: archive.targz_extract - params: - destination: src - path: build.tar.gz - # Fix path names in Makefile - - command: shell.exec - type: test - params: - working_dir: "src" - script: | - ${PREPARE_SHELL} - perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" Makefile - - "compile driver" : - - command: subprocess.exec - type: test - params: - working_dir: "src" - add_expansions_to_env: true - binary: bash - args: - - ${PROJECT_DIRECTORY}/.evergreen/compile-unix.sh - - "upload mo artifacts": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - find $MONGO_ORCHESTRATION_HOME -name \*.log | xargs tar czf mongodb-logs.tar.gz - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: mongodb-logs.tar.gz - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/x-gzip} - display_name: "mongodb-logs.tar.gz" - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: ${DRIVERS_TOOLS}/.evergreen/orchestration/server.log - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log - bucket: mciuploads - permissions: public-read - content_type: ${content_type|text/plain} - display_name: "orchestration.log" - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - find /tmp/MO -name \*.log | xargs tar czf mongodb-start-logs.tar.gz - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: mongodb-start-logs.tar.gz - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-start-logs.tar.gz - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/x-gzip} - display_name: "mongodb-start-logs.tar.gz" - - "upload working dir": - - command: archive.targz_pack - params: - target: "working-dir.tar.gz" - source_dir: ${PROJECT_DIRECTORY}/ - include: - - "./**" - - command: archive.targz_pack - params: - target: "drivers-dir.tar.gz" - source_dir: ${DRIVERS_TOOLS} - include: - - "./**" - exclude_files: - # Windows cannot read the mongod *.lock files because they are locked. - - "*.lock" - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: drivers-dir.tar.gz - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/artifacts/${task_id}-${execution}-drivers-dir.tar.gz - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/x-gzip} - display_name: "drivers-dir.tar.gz" - - "upload test results": - - command: attach.xunit_results - params: - # Uploading test results does not work when using ${PROJECT_DIRECTORY}, - # so we use an absolute path to work around this - file: "src/test-results.xml" - - command: attach.results - params: - file_location: "${DRIVERS_TOOLS}/results.json" - - "bootstrap mongo-orchestration": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - SKIP_LEGACY_SHELL=true MONGODB_VERSION=${MONGODB_VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} LOAD_BALANCER=${LOAD_BALANCER} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh - # run-orchestration generates expansion file with MONGODB_URI and CRYPT_SHARED_LIB_PATH - - command: expansions.update - params: - file: mo-expansion.yml - - "stop mongo-orchestration": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - sh ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh - - "run OCSP responder": - - command: shell.exec - params: - shell: bash - script: | - ${PREPARE_SHELL} - TEST_COLUMN=${TEST_COLUMN} \ - CERT_TYPE=${CERT_TYPE} \ - USE_DELEGATE=${USE_DELEGATE} \ - ${PROJECT_DIRECTORY}/.evergreen/run-ocsp-responder.sh - - "run tests": - - command: shell.exec - type: test - params: - working_dir: "src" - script: | - ${PREPARE_SHELL} - API_VERSION=${API_VERSION} \ - CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \ - MONGODB_URI="${MONGODB_URI}${APPEND_URI}" \ - SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} \ - SSL=${SSL} \ - SSL_DIR=${SSL_DIR} \ - TESTS=${TESTS} \ - sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh - - "cleanup": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - rm -rf $DRIVERS_TOOLS || true - - "fix absolute paths": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - for filename in $(find ${DRIVERS_TOOLS} -name \*.json); do - perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename - done - - "windows fix": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do - cat $i | tr -d '\r' > $i.new - mv $i.new $i - done - - "make files executable": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do - chmod +x $i - done - - "init test-results": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - echo '{"results": [{ "status": "FAIL", "test_file": "Build", "log_raw": "No test-results.json found was created" } ]}' > ${PROJECT_DIRECTORY}/test-results.json - - "install dependencies": - - command: shell.exec - params: - working_dir: "src" - script: | - ${PREPARE_SHELL} - file="${DRIVERS_TOOLS}/.evergreen/install-dependencies.sh" - # Don't use ${file} syntax here because evergreen treats it as an empty expansion. - [ -f "$file" ] && sh $file || echo "$file not available, skipping" - - "decrypt atlas URI list": - - command: shell.exec - params: - script: | - openssl aes-256-cbc -S "${encrypted_uris_salt}" -K "${encrypted_uris_key}" -iv "${encrypted_uris_iv}" -in ${PROJECT_DIRECTORY}/.evergreen/atlas-uris.txt.enc -out ${PROJECT_DIRECTORY}/.evergreen/atlas-uris.txt -d - - "start load balancer": - - command: shell.exec - params: - script: | - MONGODB_URI="${MONGODB_URI}" ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh start - - command: expansions.update - params: - file: lb-expansion.yml - - "stop load balancer": - - command: shell.exec - params: - script: | - # Only run if a load balancer was started - if [ -n "${SINGLE_MONGOS_LB_URI}" ]; then - ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop - fi - -tasks: - - name: "build-php-8.2" - tags: ["build", "php8.2"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "8.2" - - func: "upload build" - - - name: "build-php-8.1" - tags: ["build", "php8.1"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "8.1" - - func: "upload build" - - - name: "build-php-8.0" - tags: ["build", "php8.0"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "8.0" - - func: "upload build" - - - name: "build-php-7.4" - tags: ["build", "php7.4"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "7.4" - - func: "upload build" - - # - # Tasks for testing local deployments - # - - # MongoDB latest - - name: "test-mongodb-latest-standalone-noauth-nossl" - tags: ["standalone", "local", "latest"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "latest" - - func: "run tests" - - name: "test-mongodb-latest-standalone-auth" - tags: ["standalone", "local", "latest"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "latest" - - func: "run tests" - - name: "test-mongodb-latest-standalone-ssl" - tags: ["standalone", "local", "latest"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "latest" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-latest-replicaset-noauth-nossl" - tags: ["replicaset", "local", "latest"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "latest" - - func: "run tests" - - name: "test-mongodb-latest-replicaset-auth" - tags: ["replicaset", "local", "latest"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "latest" - - func: "run tests" - - name: "test-mongodb-latest-sharded-noauth-nossl" - tags: ["sharded", "local", "latest"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "latest" - - func: "run tests" - - # MongoDB Rapid Release - - name: "test-mongodb-rapid-standalone-noauth-nossl" - tags: ["standalone", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "rapid" - - func: "run tests" - - name: "test-mongodb-rapid-standalone-auth" - tags: ["standalone", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "rapid" - - func: "run tests" - - name: "test-mongodb-rapid-standalone-ssl" - tags: ["standalone", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "rapid" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-rapid-replicaset-noauth-nossl" - tags: ["replicaset", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "rapid" - - func: "run tests" - - name: "test-mongodb-rapid-replicaset-auth" - tags: ["replicaset", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "rapid" - - func: "run tests" - - name: "test-mongodb-rapid-sharded-noauth-nossl" - tags: ["sharded", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "rapid" - - func: "run tests" - - # MongoDB 7.0 - - name: "test-mongodb-7.0-standalone-noauth-nossl" - tags: ["standalone", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "7.0" - - func: "run tests" - - name: "test-mongodb-7.0-standalone-auth" - tags: ["standalone", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "7.0" - - func: "run tests" - - name: "test-mongodb-7.0-standalone-ssl" - tags: ["standalone", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "7.0" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-7.0-replicaset-noauth-nossl" - tags: ["replicaset", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "7.0" - - func: "run tests" - - name: "test-mongodb-7.0-replicaset-auth" - tags: ["replicaset", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "7.0" - - func: "run tests" - - name: "test-mongodb-7.0-sharded-noauth-nossl" - tags: ["sharded", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "7.0" - - func: "run tests" - - # MongoDB 6.0 - - name: "test-mongodb-6.0-standalone-noauth-nossl" - tags: ["standalone", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "6.0" - - func: "run tests" - - name: "test-mongodb-6.0-standalone-auth" - tags: ["standalone", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "6.0" - - func: "run tests" - - name: "test-mongodb-6.0-standalone-ssl" - tags: ["standalone", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "6.0" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-6.0-replicaset-noauth-nossl" - tags: ["replicaset", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "6.0" - - func: "run tests" - - name: "test-mongodb-6.0-replicaset-auth" - tags: ["replicaset", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "6.0" - - func: "run tests" - - name: "test-mongodb-6.0-sharded-noauth-nossl" - tags: ["sharded", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "6.0" - - func: "run tests" - - # MongoDB 5.0 - - name: "test-mongodb-5.0-standalone-noauth-nossl" - tags: ["standalone", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "5.0" - - func: "run tests" - - name: "test-mongodb-5.0-standalone-auth" - tags: ["standalone", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "5.0" - - func: "run tests" - - name: "test-mongodb-5.0-standalone-ssl" - tags: ["standalone", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "5.0" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-5.0-replicaset-noauth-nossl" - tags: ["replicaset", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "5.0" - - func: "run tests" - - name: "test-mongodb-5.0-replicaset-auth" - tags: ["replicaset", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "5.0" - - func: "run tests" - - name: "test-mongodb-5.0-sharded-noauth-nossl" - tags: ["sharded", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "5.0" - - func: "run tests" - - # MongoDB 4.4 - - name: "test-mongodb-4.4-standalone-noauth-nossl" - tags: ["standalone", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "4.4" - - func: "run tests" - - name: "test-mongodb-4.4-standalone-auth" - tags: ["standalone", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "4.4" - - func: "run tests" - - name: "test-mongodb-4.4-standalone-ssl" - tags: ["standalone", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "4.4" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-4.4-replicaset-noauth-nossl" - tags: ["replicaset", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "4.4" - - func: "run tests" - - name: "test-mongodb-4.4-replicaset-auth" - tags: ["replicaset", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "4.4" - - func: "run tests" - - name: "test-mongodb-4.4-sharded-noauth-nossl" - tags: ["sharded", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "4.4" - - func: "run tests" - - # MongoDB 4.2 - - name: "test-mongodb-4.2-standalone-noauth-nossl" - tags: ["standalone", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "4.2" - - func: "run tests" - - name: "test-mongodb-4.2-standalone-auth" - tags: ["standalone", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "4.2" - - func: "run tests" - - name: "test-mongodb-4.2-standalone-ssl" - tags: ["standalone", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "4.2" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-4.2-replicaset-noauth-nossl" - tags: ["replicaset", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "4.2" - - func: "run tests" - - name: "test-mongodb-4.2-replicaset-auth" - tags: ["replicaset", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "4.2" - - func: "run tests" - - name: "test-mongodb-4.2-sharded-noauth-nossl" - tags: ["sharded", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "4.2" - - func: "run tests" - - # MongoDB 4.0 - - name: "test-mongodb-4.0-standalone-noauth-nossl" - tags: ["standalone", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "4.0" - - func: "run tests" - - name: "test-mongodb-4.0-standalone-auth" - tags: ["standalone", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "4.0" - - func: "run tests" - - name: "test-mongodb-4.0-standalone-ssl" - tags: ["standalone", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "4.0" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-4.0-replicaset-noauth-nossl" - tags: ["replicaset", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "4.0" - - func: "run tests" - - name: "test-mongodb-4.0-replicaset-auth" - tags: ["replicaset", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "4.0" - - func: "run tests" - - name: "test-mongodb-4.0-sharded-noauth-nossl" - tags: ["sharded", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "4.0" - - func: "run tests" - - # MongoDB 3.6 - - name: "test-mongodb-3.6-standalone-noauth-nossl" - tags: ["standalone", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "3.6" - - func: "run tests" - - name: "test-mongodb-3.6-standalone-auth" - tags: ["standalone", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "3.6" - - func: "run tests" - - name: "test-mongodb-3.6-standalone-ssl" - tags: ["standalone", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "3.6" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-3.6-replicaset-noauth-nossl" - tags: ["replicaset", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "3.6" - - func: "run tests" - - name: "test-mongodb-3.6-replicaset-auth" - tags: ["replicaset", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "3.6" - - func: "run tests" - - name: "test-mongodb-3.6-sharded-noauth-nossl" - tags: ["sharded", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "3.6" - - func: "run tests" - - # - # Old tasks - # - - - name: "test-atlas" - tags: ["atlas"] - commands: - - func: "compile driver" - - func: "decrypt atlas URI list" - - func: "run tests" - vars: - TESTS: "tests/atlas.phpt" - - - name: "test-skip_crypt_shared" - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - - name: "test-loadBalanced" - tags: ["loadbalanced"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - LOAD_BALANCER: "true" - SSL: "yes" - - func: "start load balancer" - - func: "run tests" - vars: - # Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI - MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" - SSL: "yes" - # Note: "stop load balancer" will be called from "post" - - - name: "test-requireApiVersion" - tags: ["versioned_api"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - REQUIRE_API_VERSION: "yes" - - func: "run tests" - vars: - API_VERSION: "1" - - - name: "ocsp-test_1-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_1" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_1-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_1" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_1-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_1" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_1-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_1" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_2-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_2" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_2-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_2" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_2-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_2" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_2-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_2" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_3-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_3" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_3-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_3" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_3-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_3" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_3-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_3" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_4-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_4" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_4-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_4" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_4-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_4" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_4-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "TEST_4" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-soft_fail_test-rsa" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-soft_fail_test-ecdsa" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-success.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_1-rsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" - CERT_TYPE: "rsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_1-ecdsa-delegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "on" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_1-rsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" - CERT_TYPE: "rsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "run OCSP responder" - vars: - TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" - CERT_TYPE: "ecdsa" - USE_DELEGATE: "off" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_2-rsa" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_2-ecdsa" - tags: ["ocsp"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - - func: "run tests" - vars: - TESTS: "tests/ocsp-failure.phpt" - APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - # # Pre and post are only used for variants that build; they are ignored when task groups are used # @@ -1371,304 +28,10 @@ post: - func: "upload working dir" - func: "cleanup" -task_groups: - - name: "test-local-deployment-7.0" - setup_group: - - func: "fetch source" - - func: "prepare resources" - - func: "windows fix" - - func: "fix absolute paths" - - func: "init test-results" - - func: "make files executable" - - func: "install dependencies" - - func: "fetch build" - teardown_group: - - func: "upload mo artifacts" - - func: "upload test results" - - func: "stop mongo-orchestration" - - func: "upload working dir" - - func: "cleanup" - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - ".standalone .local .7.0" - - ".replicaset .local .7.0" - - ".sharded .local .7.0" - - -axes: - - id: os - display_name: OS - values: - # Debian - - id: debian11 - display_name: "Debian 11" - run_on: debian11-small - - id: debian10 - display_name: "Debian 10" - run_on: debian10-small - - id: debian92 - display_name: "Debian 9.2" - run_on: debian92-small - - # RHEL - - id: rhel90 - display_name: "RHEL 9.0" - run_on: rhel90-small - - id: rhel83-zseries - display_name: "RHEL 8.3 Zseries" - run_on: rhel83-zseries-small - - id: rhel82-arm64 - display_name: "RHEL 8.2 ARM64" - run_on: rhel82-arm64-small - - id: rhel81-power8 - display_name: "RHEL 8.1 Power8" - run_on: rhel81-power8-large - - id: rhel80 - display_name: "RHEL 8.0" - run_on: rhel80-small - - id: rhel76 - display_name: "RHEL 7.6" - run_on: rhel76-small - - # Ubuntu LTS - - id: ubuntu2204 - display_name: "Ubuntu 22.04 x64" - run_on: ubuntu2204-small - - id: ubuntu2204-arm64 - display_name: "Ubuntu 22.04 ARM64" - run_on: ubuntu2204-arm64-small - - id: ubuntu2004 - display_name: "Ubuntu 20.04 x64" - run_on: ubuntu2004-small - - id: ubuntu2004-arm64 - display_name: "Ubuntu 20.04 ARM64" - run_on: ubuntu2004-arm64-small - - - id: storage-engine - display_name: Storage - values: - - id: mmapv1 - display_name: MMAPv1 - variables: - STORAGE_ENGINE: "mmapv1" - - id: wiredtiger - display_name: WiredTiger - variables: - STORAGE_ENGINE: "wiredtiger" - - id: inmemory - display_name: InMemory - variables: - STORAGE_ENGINE: "inmemory" - - - id: libmongoc-version - display_name: libmongoc version - values: - - id: "lowest-supported" - display_name: "1.25-dev" - variables: - LIBMONGOC_VERSION: "master" -# - id: "upcoming-stable" -# display_name: "1.25-dev" -# variables: -# LIBMONGOC_VERSION: "r1.25" -# - id: "latest-dev" -# display_name: "master" -# variables: -# LIBMONGOC_VERSION: "master" - - -buildvariants: - # - # Build variants to build the driver - these are run for all operating systems and PHP versions we support - # - - # Debian - - name: build-debian11 - display_name: "Build: Debian 11" - run_on: debian11-small - tasks: - - name: ".build" - - name: build-debian10 - display_name: "Build: Debian 10" - run_on: debian10-small - tasks: - - name: ".build" - - name: build-debian92 - display_name: "Build: Debian 9.2" - run_on: debian92-small - tasks: - - name: ".build" - - # RHEL - - name: build-rhel90 - display_name: "Build: RHEL 9.0" - run_on: rhel90-small - tasks: - - name: ".build !.php7.4 !.php8.0" - - name: build-rhel83-zseries - display_name: "Build: RHEL 8.3 Zseries" - run_on: rhel83-zseries-small - tasks: - - name: ".build" - - name: build-rhel82-arm64 - display_name: "Build: RHEL 8.2 ARM64" - run_on: rhel82-arm64 - tasks: - - name: ".build" - - name: build-rhel81-power8 - display_name: "Build: RHEL 8.1 Power8" - run_on: rhel81-power8-large - tasks: - - name: ".build" - - name: build-rhel80 - display_name: "Build: RHEL 8.0" - run_on: rhel80-small - tasks: - - name: ".build" - - name: build-rhel76 - display_name: "Build: RHEL 7.6" - run_on: rhel76-small - tasks: - - name: ".build" - - # Ubuntu LTS - - name: build-ubuntu2204 - display_name: "Build: Ubuntu 22.04 x64" - run_on: ubuntu2204-arm64 - tasks: - - name: ".build !.php7.4 !.php8.0" - - name: build-ubuntu2204-arm64 - display_name: "Build: Ubuntu 22.04 ARM64" - run_on: ubuntu2204-arm64-small - tasks: - - name: ".build !.php7.4 !.php8.0" - - name: build-ubuntu2004 - display_name: "Build: Ubuntu 20.04 x64" - run_on: ubuntu2004-arm64 - tasks: - - name: ".build" - - name: build-ubuntu2004-arm64 - display_name: "Build: Ubuntu 20.04 ARM64" - run_on: ubuntu2004-arm64-small - tasks: - - name: ".build" - - # - # Test variants - only run for select platforms worth testing on - # - - name: test-debian11-php82-local - display_name: "Test: Debian 11, PHP 8.2" - run_on: debian11-small - expansions: - FETCH_BUILD_VARIANT: "build-debian11" - FETCH_BUILD_TASK: "build-php-8.2" - depends_on: - - variant: "build-debian11" - name: "build-php-8.2" - tasks: - - name: "test-local-deployment-7.0" - -# -# Old build variants preserved below -# -# - matrix_name: "test-php-versions" -# matrix_spec: -# os: -# - debian11 -# - debian10 -# - rhel90 -# - rhel83-zseries -# - rhel82-arm64 -# - rhel81-power8 -# - rhel80 -# - rhel76 -# - ubuntu2204-arm64 -# - ubuntu2204 -# - ubuntu2004-arm64 -# - ubuntu2004 -# mongodb-edge-versions: latest-stable -# php-versions: "*" -# display_name: "${os}, ${mongodb-edge-versions}, ${php-versions}" -# exclude_spec: -# # Exclude "latest-stable" PHP version for Debian 11 (see: test-mongodb-versions matrix) -# - { "os": "debian11", "mongodb-edge-versions": "*", "php-versions": "8.2" } -# # Exclude PHP versions older than 8.1 on RHEL 9 and Ubuntu 22.04 (OpenSSL 3 is only supported on PHP 8.1+) -# - { "os": ["rhel90", "ubuntu2204-arm64", "ubuntu2204"], "mongodb-edge-versions": "*", "php-versions": ["7.4", "8.0"] } -# tasks: -# - name: "test-standalone-ssl" -# - name: "test-replicaset-auth" -# - name: "test-sharded" -# -# # Test all topologies and MongoDB versions with latest-stable PHP version on Debian -# - matrix_name: "test-mongodb-versions" -# matrix_spec: { "os": ["debian92", "debian11"], "mongodb-versions": "*", "php-edge-versions": "latest-stable" } -# display_name: "${os}, ${mongodb-versions}, ${php-edge-versions}" -# exclude_spec: -# # Debian 9.2 only supports up to MongoDB 5.0 -# - { "os": "debian92", "mongodb-versions": ["6.0", "7.0", "rapid", "latest"], "php-edge-versions": "latest-stable" } -# - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } -# tasks: -# - name: "test-standalone" -# - name: "test-standalone-auth" -# - name: "test-standalone-ssl" -# - name: "test-replicaset" -# - name: "test-replicaset-auth" -# - name: "test-sharded" -# -# # Test alternative storage engines on MongoDB 4.0 -# - matrix_name: "test-storage-engines" -# matrix_spec: { "os": "debian92", "mongodb-versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": ["inmemory", "mmapv1"] } -# display_name: "${storage-engine}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" -# tasks: -# - name: "test-standalone" -# -# - matrix_name: "libmongoc-versions" -# matrix_spec: { "os": "debian11", "mongodb-edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" } -# display_name: "libmongoc ${libmongoc-version}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" -# tasks: -# - name: "test-standalone-ssl" -# - name: "test-replicaset-auth" -# - name: "test-sharded" -# -# - matrix_name: "atlas-connectivity-tests" -# matrix_spec: { "os": "debian11", "php-edge-versions": "latest-stable" } -# display_name: "Atlas Connectivity" -# tasks: -# - name: "test-atlas" -# -# - matrix_name: "test-ocsp" -# matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } -# display_name: "OCSP tests - ${mongodb-versions}" -# exclude_spec: -# # OCSP is available from MongoDB 4.4+ (Debian 10 has MongoDB 4.4+) -# - { "os": "debian10", "mongodb-versions": ["3.6", "4.0", "4.2"], "php-edge-versions": "latest-stable" } -# tasks: -# - name: ".ocsp" -# -# - matrix_name: "test-requireApiVersion" -# matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } -# display_name: "Versioned API - ${mongodb-versions}" -# exclude_spec: -# # Stable API is available from MongoDB 5.0+ -# - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } -# tasks: -# - name: "test-requireApiVersion" -# -# - matrix_name: "test-loadBalanced" -# matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } -# display_name: "Load balanced - ${mongodb-versions}" -# exclude_spec: -# # Load balancer is available from MongoDB 5.0+ -# - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } -# tasks: -# - name: "test-loadBalanced" -# -# - matrix_name: "test-csfle-skip_crypt_shared" -# matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } -# display_name: "CSFLE skip_crypt_shared - ${mongodb-versions}" -# exclude_spec: -# # CSFLE crypt_shared is available from MongoDB 6.0+ -# - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } -# tasks: -# - name: "test-skip_crypt_shared" +include: + - filename: .evergreen/config/functions.yml + - filename: .evergreen/config/build-tasks.yml + - filename: .evergreen/config/build-variants.yml + - filename: .evergreen/config/test-tasks.yml + - filename: .evergreen/config/test-task-groups.yml + - filename: .evergreen/config/test-variants.yml diff --git a/.evergreen/config/build-tasks.yml b/.evergreen/config/build-tasks.yml new file mode 100644 index 000000000..6ec889724 --- /dev/null +++ b/.evergreen/config/build-tasks.yml @@ -0,0 +1,32 @@ +tasks: + - name: "build-php-8.2" + tags: ["build", "php8.2"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.2" + - func: "upload build" + + - name: "build-php-8.1" + tags: ["build", "php8.1"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.1" + - func: "upload build" + + - name: "build-php-8.0" + tags: ["build", "php8.0"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.0" + - func: "upload build" + + - name: "build-php-7.4" + tags: ["build", "php7.4"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "7.4" + - func: "upload build" diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml new file mode 100644 index 000000000..748c7cca1 --- /dev/null +++ b/.evergreen/config/build-variants.yml @@ -0,0 +1,74 @@ +# +# Build variants to build the driver - these are run for all operating systems and PHP versions we support +# +buildvariants: + # Debian + - name: build-debian11 + display_name: "Build: Debian 11" + run_on: debian11-small + tasks: + - name: ".build" + - name: build-debian10 + display_name: "Build: Debian 10" + run_on: debian10-small + tasks: + - name: ".build" + - name: build-debian92 + display_name: "Build: Debian 9.2" + run_on: debian92-small + tasks: + - name: ".build" + + # RHEL + - name: build-rhel90 + display_name: "Build: RHEL 9.0" + run_on: rhel90-small + tasks: + - name: ".build !.php7.4 !.php8.0" + - name: build-rhel83-zseries + display_name: "Build: RHEL 8.3 Zseries" + run_on: rhel83-zseries-small + tasks: + - name: ".build" + - name: build-rhel82-arm64 + display_name: "Build: RHEL 8.2 ARM64" + run_on: rhel82-arm64 + tasks: + - name: ".build" + - name: build-rhel81-power8 + display_name: "Build: RHEL 8.1 Power8" + run_on: rhel81-power8-large + tasks: + - name: ".build" + - name: build-rhel80 + display_name: "Build: RHEL 8.0" + run_on: rhel80-small + tasks: + - name: ".build" + - name: build-rhel76 + display_name: "Build: RHEL 7.6" + run_on: rhel76-small + tasks: + - name: ".build" + + # Ubuntu LTS + - name: build-ubuntu2204 + display_name: "Build: Ubuntu 22.04 x64" + run_on: ubuntu2204-small + tasks: + - name: ".build !.php7.4 !.php8.0" + - name: build-ubuntu2204-arm64 + display_name: "Build: Ubuntu 22.04 ARM64" + run_on: ubuntu2204-arm64-small + tasks: + - name: ".build !.php7.4 !.php8.0" + - name: build-ubuntu2004 + display_name: "Build: Ubuntu 20.04 x64" + run_on: ubuntu2004-small + tasks: + - name: ".build" + - name: build-ubuntu2004-arm64 + display_name: "Build: Ubuntu 20.04 ARM64" + run_on: ubuntu2004-arm64-small + tasks: + - name: ".build" diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml new file mode 100644 index 000000000..efcc9afaf --- /dev/null +++ b/.evergreen/config/functions.yml @@ -0,0 +1,356 @@ +functions: + "fetch source": + # Executes git clone and applies the submitted patch, if any + - command: git.get_project + params: + directory: "src" + # Fetch the libmongoc submodule + - command: shell.exec + params: + working_dir: "src" + script: | + git submodule update --init + # Switch to a different version of libmongoc + - command: shell.exec + params: + working_dir: "src/src/libmongoc" + script: | + if [ -n "${LIBMONGOC_VERSION}" ]; then + echo "Checking out libmongoc version: ${LIBMONGOC_VERSION}" + git fetch + git checkout ${LIBMONGOC_VERSION} + # Note: compile-unix.sh will run `make libmongoc-version-current` + fi + # Make an evergreen expansion file with dynamic values + - command: shell.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)" + + # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory + if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin + export DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS) + export PROJECT_DIRECTORY=$(cygpath -m $PROJECT_DIRECTORY) + fi + + export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration" + # Note: PHPC no longer has any custom MO configs, but they can be stored here if needed + export PROJECT_ORCHESTRATION_HOME="$PROJECT_DIRECTORY/.evergreen/orchestration" + export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin" + export UPLOAD_BUCKET="${project}" + + cat < expansion.yml + CURRENT_VERSION: "$CURRENT_VERSION" + DRIVERS_TOOLS: "$DRIVERS_TOOLS" + MONGO_ORCHESTRATION_HOME: "$MONGO_ORCHESTRATION_HOME" + PROJECT_ORCHESTRATION_HOME: "$PROJECT_ORCHESTRATION_HOME" + MONGODB_BINARIES: "$MONGODB_BINARIES" + UPLOAD_BUCKET: "$UPLOAD_BUCKET" + PROJECT_DIRECTORY: "$PROJECT_DIRECTORY" + + PREPARE_SHELL: | + set -o errexit + export DRIVERS_TOOLS="$DRIVERS_TOOLS" + export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME" + export PROJECT_ORCHESTRATION_HOME="$PROJECT_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}" + + export SSL_DIR="$DRIVERS_TOOLS/.evergreen/x509gen" + export LIBMONGOC_VERSION="${LIBMONGOC_VERSION}" + EOT + # See what we've done + cat expansion.yml + + # 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} + rm -rf $DRIVERS_TOOLS + if [ "${project}" = "drivers-tools" ]; then + # If this was a patch build, doing a fresh clone would not actually test the patch + cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS + else + git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS + fi + echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config + + + # Upload build artifacts that other tasks may depend on + # Note this URL needs to be totally unique, while predictable for the next task + # so it can automatically download the artifacts + "upload build": + # Compress and upload the entire build directory + - command: archive.targz_pack + params: + target: "${build_id}.tar.gz" + source_dir: src + include: + - "./**" + - command: s3.put + params: + aws_key: ${aws_key} + aws_secret: ${aws_secret} + bucket: mciuploads + content_type: ${content_type|application/x-gzip} + permissions: public-read + local_file: ${build_id}.tar.gz + remote_file: ${project}/${build_variant}/${revision}/${task_name}/${version}.tar.gz + + "fetch build": + - command: subprocess.exec + type: setup + params: + binary: bash + args: + - -c + - rm -rf src + - command: s3.get + params: + aws_key: ${aws_key} + aws_secret: ${aws_secret} + bucket: mciuploads + remote_file: ${project}/${FETCH_BUILD_VARIANT}/${revision}/${FETCH_BUILD_TASK}/${version}.tar.gz + local_file: build.tar.gz + - command: archive.targz_extract + params: + destination: src + path: build.tar.gz + # Fix path names in Makefile + - command: shell.exec + type: test + params: + working_dir: "src" + script: | + ${PREPARE_SHELL} + perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" Makefile + + "compile driver" : + - command: subprocess.exec + type: test + params: + working_dir: "src" + add_expansions_to_env: true + binary: bash + args: + - ${PROJECT_DIRECTORY}/.evergreen/compile-unix.sh + + "upload mo artifacts": + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + find $MONGO_ORCHESTRATION_HOME -name \*.log | xargs tar czf mongodb-logs.tar.gz + - command: s3.put + params: + aws_key: ${aws_key} + aws_secret: ${aws_secret} + local_file: mongodb-logs.tar.gz + remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz + bucket: mciuploads + permissions: public-read + content_type: ${content_type|application/x-gzip} + display_name: "mongodb-logs.tar.gz" + - command: s3.put + params: + aws_key: ${aws_key} + aws_secret: ${aws_secret} + local_file: ${DRIVERS_TOOLS}/.evergreen/orchestration/server.log + remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log + bucket: mciuploads + permissions: public-read + content_type: ${content_type|text/plain} + display_name: "orchestration.log" + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + find /tmp/MO -name \*.log | xargs tar czf mongodb-start-logs.tar.gz + - command: s3.put + params: + aws_key: ${aws_key} + aws_secret: ${aws_secret} + local_file: mongodb-start-logs.tar.gz + remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-start-logs.tar.gz + bucket: mciuploads + permissions: public-read + content_type: ${content_type|application/x-gzip} + display_name: "mongodb-start-logs.tar.gz" + + "upload working dir": + - command: archive.targz_pack + params: + target: "working-dir.tar.gz" + source_dir: ${PROJECT_DIRECTORY}/ + include: + - "./**" + - command: archive.targz_pack + params: + target: "drivers-dir.tar.gz" + source_dir: ${DRIVERS_TOOLS} + include: + - "./**" + exclude_files: + # Windows cannot read the mongod *.lock files because they are locked. + - "*.lock" + - command: s3.put + params: + aws_key: ${aws_key} + aws_secret: ${aws_secret} + local_file: drivers-dir.tar.gz + remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/artifacts/${task_id}-${execution}-drivers-dir.tar.gz + bucket: mciuploads + permissions: public-read + content_type: ${content_type|application/x-gzip} + display_name: "drivers-dir.tar.gz" + + "upload test results": + - command: attach.xunit_results + params: + # Uploading test results does not work when using ${PROJECT_DIRECTORY}, + # so we use an absolute path to work around this + file: "src/test-results.xml" + - command: attach.results + params: + file_location: "${DRIVERS_TOOLS}/results.json" + + "bootstrap mongo-orchestration": + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + SKIP_LEGACY_SHELL=true MONGODB_VERSION=${MONGODB_VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} LOAD_BALANCER=${LOAD_BALANCER} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh + # run-orchestration generates expansion file with MONGODB_URI and CRYPT_SHARED_LIB_PATH + - command: expansions.update + params: + file: mo-expansion.yml + + "stop mongo-orchestration": + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + sh ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh + + "run OCSP responder": + - command: shell.exec + params: + shell: bash + script: | + ${PREPARE_SHELL} + TEST_COLUMN=${TEST_COLUMN} \ + CERT_TYPE=${CERT_TYPE} \ + USE_DELEGATE=${USE_DELEGATE} \ + ${PROJECT_DIRECTORY}/.evergreen/run-ocsp-responder.sh + + "run tests": + - command: shell.exec + type: test + params: + working_dir: "src" + script: | + ${PREPARE_SHELL} + API_VERSION=${API_VERSION} \ + CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \ + MONGODB_URI="${MONGODB_URI}${APPEND_URI}" \ + SKIP_CRYPT_SHARED=${SKIP_CRYPT_SHARED} \ + SSL=${SSL} \ + SSL_DIR=${SSL_DIR} \ + TESTS=${TESTS} \ + sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh + + "cleanup": + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + rm -rf $DRIVERS_TOOLS || true + + "fix absolute paths": + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + for filename in $(find ${DRIVERS_TOOLS} -name \*.json); do + perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename + done + + "windows fix": + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do + cat $i | tr -d '\r' > $i.new + mv $i.new $i + done + + "make files executable": + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do + chmod +x $i + done + + "init test-results": + - command: shell.exec + params: + script: | + ${PREPARE_SHELL} + echo '{"results": [{ "status": "FAIL", "test_file": "Build", "log_raw": "No test-results.json found was created" } ]}' > ${PROJECT_DIRECTORY}/test-results.json + + "install dependencies": + - command: shell.exec + params: + working_dir: "src" + script: | + ${PREPARE_SHELL} + file="${DRIVERS_TOOLS}/.evergreen/install-dependencies.sh" + # Don't use ${file} syntax here because evergreen treats it as an empty expansion. + [ -f "$file" ] && sh $file || echo "$file not available, skipping" + + "decrypt atlas URI list": + - command: shell.exec + params: + script: | + openssl aes-256-cbc -S "${encrypted_uris_salt}" -K "${encrypted_uris_key}" -iv "${encrypted_uris_iv}" -in ${PROJECT_DIRECTORY}/.evergreen/atlas-uris.txt.enc -out ${PROJECT_DIRECTORY}/.evergreen/atlas-uris.txt -d + + "start load balancer": + - command: shell.exec + params: + script: | + MONGODB_URI="${MONGODB_URI}" ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh start + - command: expansions.update + params: + file: lb-expansion.yml + + "stop load balancer": + - command: shell.exec + params: + script: | + # Only run if a load balancer was started + if [ -n "${SINGLE_MONGOS_LB_URI}" ]; then + ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop + fi diff --git a/.evergreen/config/legacy-tasks.yml b/.evergreen/config/legacy-tasks.yml new file mode 100644 index 000000000..372f46a2e --- /dev/null +++ b/.evergreen/config/legacy-tasks.yml @@ -0,0 +1,438 @@ +tasks: + - name: "test-atlas" + tags: ["atlas"] + commands: + - func: "compile driver" + - func: "decrypt atlas URI list" + - func: "run tests" + vars: + TESTS: "tests/atlas.phpt" + + - name: "test-skip_crypt_shared" + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" + + - name: "test-loadBalanced" + tags: ["loadbalanced"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + # Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" + # Note: "stop load balancer" will be called from "post" + + - name: "test-requireApiVersion" + tags: ["versioned_api"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + - func: "run tests" + vars: + API_VERSION: "1" + + - name: "ocsp-test_1-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa" + tags: ["ocsp"] + commands: + - func: "compile driver" + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" diff --git a/.evergreen/config/legacy-variants.yml b/.evergreen/config/legacy-variants.yml new file mode 100644 index 000000000..705f5ae36 --- /dev/null +++ b/.evergreen/config/legacy-variants.yml @@ -0,0 +1,182 @@ +axes: + - id: os + display_name: OS + values: + # Debian + - id: debian11 + display_name: "Debian 11" + run_on: debian11-small + - id: debian10 + display_name: "Debian 10" + run_on: debian10-small + - id: debian92 + display_name: "Debian 9.2" + run_on: debian92-small + + # RHEL + - id: rhel90 + display_name: "RHEL 9.0" + run_on: rhel90-small + - id: rhel83-zseries + display_name: "RHEL 8.3 Zseries" + run_on: rhel83-zseries-small + - id: rhel82-arm64 + display_name: "RHEL 8.2 ARM64" + run_on: rhel82-arm64-small + - id: rhel81-power8 + display_name: "RHEL 8.1 Power8" + run_on: rhel81-power8-large + - id: rhel80 + display_name: "RHEL 8.0" + run_on: rhel80-small + - id: rhel76 + display_name: "RHEL 7.6" + run_on: rhel76-small + + # Ubuntu LTS + - id: ubuntu2204 + display_name: "Ubuntu 22.04 x64" + run_on: ubuntu2204-small + - id: ubuntu2204-arm64 + display_name: "Ubuntu 22.04 ARM64" + run_on: ubuntu2204-arm64-small + - id: ubuntu2004 + display_name: "Ubuntu 20.04 x64" + run_on: ubuntu2004-small + - id: ubuntu2004-arm64 + display_name: "Ubuntu 20.04 ARM64" + run_on: ubuntu2004-arm64-small + + - id: storage-engine + display_name: Storage + values: + - id: mmapv1 + display_name: MMAPv1 + variables: + STORAGE_ENGINE: "mmapv1" + - id: wiredtiger + display_name: WiredTiger + variables: + STORAGE_ENGINE: "wiredtiger" + - id: inmemory + display_name: InMemory + variables: + STORAGE_ENGINE: "inmemory" + + - id: libmongoc-version + display_name: libmongoc version + values: + - id: "lowest-supported" + display_name: "1.25-dev" + variables: + LIBMONGOC_VERSION: "master" +# - id: "upcoming-stable" +# display_name: "1.25-dev" +# variables: +# LIBMONGOC_VERSION: "r1.25" +# - id: "latest-dev" +# display_name: "master" +# variables: +# LIBMONGOC_VERSION: "master" + +buildvariants: + - matrix_name: "test-php-versions" + matrix_spec: + os: + - debian11 + - debian10 + - rhel90 + - rhel83-zseries + - rhel82-arm64 + - rhel81-power8 + - rhel80 + - rhel76 + - ubuntu2204-arm64 + - ubuntu2204 + - ubuntu2004-arm64 + - ubuntu2004 + mongodb-edge-versions: latest-stable + php-versions: "*" + display_name: "${os}, ${mongodb-edge-versions}, ${php-versions}" + exclude_spec: + # Exclude "latest-stable" PHP version for Debian 11 (see: test-mongodb-versions matrix) + - { "os": "debian11", "mongodb-edge-versions": "*", "php-versions": "8.2" } + # Exclude PHP versions older than 8.1 on RHEL 9 and Ubuntu 22.04 (OpenSSL 3 is only supported on PHP 8.1+) + - { "os": ["rhel90", "ubuntu2204-arm64", "ubuntu2204"], "mongodb-edge-versions": "*", "php-versions": ["7.4", "8.0"] } + tasks: + - name: "test-standalone-ssl" + - name: "test-replicaset-auth" + - name: "test-sharded" + + # Test all topologies and MongoDB versions with latest-stable PHP version on Debian + - matrix_name: "test-mongodb-versions" + matrix_spec: { "os": ["debian92", "debian11"], "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "${os}, ${mongodb-versions}, ${php-edge-versions}" + exclude_spec: + # Debian 9.2 only supports up to MongoDB 5.0 + - { "os": "debian92", "mongodb-versions": ["6.0", "7.0", "rapid", "latest"], "php-edge-versions": "latest-stable" } + - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } + tasks: + - name: "test-standalone" + - name: "test-standalone-auth" + - name: "test-standalone-ssl" + - name: "test-replicaset" + - name: "test-replicaset-auth" + - name: "test-sharded" + + # Test alternative storage engines on MongoDB 4.0 + - matrix_name: "test-storage-engines" + matrix_spec: { "os": "debian92", "mongodb-versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": ["inmemory", "mmapv1"] } + display_name: "${storage-engine}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" + tasks: + - name: "test-standalone" + + - matrix_name: "libmongoc-versions" + matrix_spec: { "os": "debian11", "mongodb-edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" } + display_name: "libmongoc ${libmongoc-version}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" + tasks: + - name: "test-standalone-ssl" + - name: "test-replicaset-auth" + - name: "test-sharded" + + - matrix_name: "atlas-connectivity-tests" + matrix_spec: { "os": "debian11", "php-edge-versions": "latest-stable" } + display_name: "Atlas Connectivity" + tasks: + - name: "test-atlas" + + - matrix_name: "test-ocsp" + matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "OCSP tests - ${mongodb-versions}" + exclude_spec: + # OCSP is available from MongoDB 4.4+ (Debian 10 has MongoDB 4.4+) + - { "os": "debian10", "mongodb-versions": ["3.6", "4.0", "4.2"], "php-edge-versions": "latest-stable" } + tasks: + - name: ".ocsp" + + - matrix_name: "test-requireApiVersion" + matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "Versioned API - ${mongodb-versions}" + exclude_spec: + # Stable API is available from MongoDB 5.0+ + - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } + tasks: + - name: "test-requireApiVersion" + + - matrix_name: "test-loadBalanced" + matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "Load balanced - ${mongodb-versions}" + exclude_spec: + # Load balancer is available from MongoDB 5.0+ + - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } + tasks: + - name: "test-loadBalanced" + + - matrix_name: "test-csfle-skip_crypt_shared" + matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } + display_name: "CSFLE skip_crypt_shared - ${mongodb-versions}" + exclude_spec: + # CSFLE crypt_shared is available from MongoDB 6.0+ + - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } + tasks: + - name: "test-skip_crypt_shared" diff --git a/.evergreen/config/test-task-groups.yml b/.evergreen/config/test-task-groups.yml new file mode 100644 index 000000000..b8b469110 --- /dev/null +++ b/.evergreen/config/test-task-groups.yml @@ -0,0 +1,23 @@ +task_groups: + - name: "test-local-deployment-7.0" + setup_group: + - func: "fetch source" + - func: "prepare resources" + - func: "windows fix" + - func: "fix absolute paths" + - func: "init test-results" + - func: "make files executable" + - func: "install dependencies" + - func: "fetch build" + teardown_group: + - func: "upload mo artifacts" + - func: "upload test results" + - func: "stop mongo-orchestration" + - func: "upload working dir" + - func: "cleanup" + setup_group_can_fail_task: true + setup_group_timeout_secs: 1800 + tasks: + - ".standalone .local .7.0" + - ".replicaset .local .7.0" + - ".sharded .local .7.0" diff --git a/.evergreen/config/test-tasks.yml b/.evergreen/config/test-tasks.yml new file mode 100644 index 000000000..fe94b65a1 --- /dev/null +++ b/.evergreen/config/test-tasks.yml @@ -0,0 +1,495 @@ +tasks: + # MongoDB latest + - name: "test-mongodb-latest-standalone-noauth-nossl" + tags: ["standalone", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "latest" + - func: "run tests" + - name: "test-mongodb-latest-standalone-auth" + tags: ["standalone", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "latest" + - func: "run tests" + - name: "test-mongodb-latest-standalone-ssl" + tags: ["standalone", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "latest" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-latest-replicaset-noauth-nossl" + tags: ["replicaset", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "latest" + - func: "run tests" + - name: "test-mongodb-latest-replicaset-auth" + tags: ["replicaset", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "latest" + - func: "run tests" + - name: "test-mongodb-latest-sharded-noauth-nossl" + tags: ["sharded", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "latest" + - func: "run tests" + + # MongoDB Rapid Release + - name: "test-mongodb-rapid-standalone-noauth-nossl" + tags: ["standalone", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-standalone-auth" + tags: ["standalone", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-standalone-ssl" + tags: ["standalone", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "rapid" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-rapid-replicaset-noauth-nossl" + tags: ["replicaset", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-replicaset-auth" + tags: ["replicaset", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-sharded-noauth-nossl" + tags: ["sharded", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "rapid" + - func: "run tests" + + # MongoDB 7.0 + - name: "test-mongodb-7.0-standalone-noauth-nossl" + tags: ["standalone", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-7.0-standalone-auth" + tags: ["standalone", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-7.0-standalone-ssl" + tags: ["standalone", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "7.0" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-7.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-7.0-replicaset-auth" + tags: ["replicaset", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-7.0-sharded-noauth-nossl" + tags: ["sharded", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "7.0" + - func: "run tests" + + # MongoDB 6.0 + - name: "test-mongodb-6.0-standalone-noauth-nossl" + tags: ["standalone", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-6.0-standalone-auth" + tags: ["standalone", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-6.0-standalone-ssl" + tags: ["standalone", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "6.0" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-6.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-6.0-replicaset-auth" + tags: ["replicaset", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-6.0-sharded-noauth-nossl" + tags: ["sharded", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "6.0" + - func: "run tests" + + # MongoDB 5.0 + - name: "test-mongodb-5.0-standalone-noauth-nossl" + tags: ["standalone", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-5.0-standalone-auth" + tags: ["standalone", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-5.0-standalone-ssl" + tags: ["standalone", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "5.0" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-5.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-5.0-replicaset-auth" + tags: ["replicaset", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-5.0-sharded-noauth-nossl" + tags: ["sharded", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "5.0" + - func: "run tests" + + # MongoDB 4.4 + - name: "test-mongodb-4.4-standalone-noauth-nossl" + tags: ["standalone", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-4.4-standalone-auth" + tags: ["standalone", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-4.4-standalone-ssl" + tags: ["standalone", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.4" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-4.4-replicaset-noauth-nossl" + tags: ["replicaset", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-4.4-replicaset-auth" + tags: ["replicaset", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-4.4-sharded-noauth-nossl" + tags: ["sharded", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.4" + - func: "run tests" + + # MongoDB 4.2 + - name: "test-mongodb-4.2-standalone-noauth-nossl" + tags: ["standalone", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-4.2-standalone-auth" + tags: ["standalone", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-4.2-standalone-ssl" + tags: ["standalone", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.2" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-4.2-replicaset-noauth-nossl" + tags: ["replicaset", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-4.2-replicaset-auth" + tags: ["replicaset", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-4.2-sharded-noauth-nossl" + tags: ["sharded", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.2" + - func: "run tests" + + # MongoDB 4.0 + - name: "test-mongodb-4.0-standalone-noauth-nossl" + tags: ["standalone", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-4.0-standalone-auth" + tags: ["standalone", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-4.0-standalone-ssl" + tags: ["standalone", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.0" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-4.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-4.0-replicaset-auth" + tags: ["replicaset", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-4.0-sharded-noauth-nossl" + tags: ["sharded", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.0" + - func: "run tests" + + # MongoDB 3.6 + - name: "test-mongodb-3.6-standalone-noauth-nossl" + tags: ["standalone", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-3.6-standalone-auth" + tags: ["standalone", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-3.6-standalone-ssl" + tags: ["standalone", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "3.6" + - func: "run tests" + vars: + SSL: "yes" + - name: "test-mongodb-3.6-replicaset-noauth-nossl" + tags: ["replicaset", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-3.6-replicaset-auth" + tags: ["replicaset", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-3.6-sharded-noauth-nossl" + tags: ["sharded", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "3.6" + - func: "run tests" diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml new file mode 100644 index 000000000..2d5505994 --- /dev/null +++ b/.evergreen/config/test-variants.yml @@ -0,0 +1,15 @@ +buildvariants: + # + # Test variants - only run for select platforms worth testing on + # + - name: test-debian11-php82-local + display_name: "Test: Debian 11, PHP 8.2" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.2" + depends_on: + - variant: "build-debian11" + name: "build-php-8.2" + tasks: + - name: "test-local-deployment-7.0" From 6815c3e0e8800ef1e61caed457e350bd21faca16 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 20 Sep 2023 09:56:30 +0200 Subject: [PATCH 12/44] Add task group for builds --- .evergreen/config.yml | 34 ++++++++----------------- .evergreen/config/build-task-groups.yml | 33 ++++++++++++++++++++++++ .evergreen/config/build-variants.yml | 26 +++++++++---------- 3 files changed, 56 insertions(+), 37 deletions(-) create mode 100644 .evergreen/config/build-task-groups.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index bdce01ee6..11145096a 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1,37 +1,23 @@ -# When a task that used to pass starts to fail -# Go through all versions that may have been skipped to detect -# when the task started failing +# When a task that used to pass starts to fail, go through all versions that may have been skipped to detect when the +# task started failing. stepback: true -# Mark a failure as a system/bootstrap failure (purple box) rather then a task -# failure by default. +# Mark a failure as a system/bootstrap failure (purple box) rather than a task failure by default. # Actual testing tasks are marked with `type: test` command_type: system -# Protect ourself against rogue test case, or curl gone wild, that runs forever -# Good rule of thumb: the averageish length a task takes, times 5 -# That roughly accounts for variable system performance for various buildvariants -exec_timeout_secs: 1800 # 6 minutes is the longest we'll ever run - -# -# Pre and post are only used for variants that build; they are ignored when task groups are used -# -pre: - - func: "fetch source" - - func: "prepare resources" - - func: "windows fix" - - func: "fix absolute paths" - - func: "make files executable" - - func: "install dependencies" - -post: - - func: "upload working dir" - - func: "cleanup" +# Protect ourselves against rogue test case that runs forever +# Good rule of thumb: the average length a task takes, times 5, which roughly accounts for variable system performance +# for various build variants +exec_timeout_secs: 1800 include: - filename: .evergreen/config/functions.yml + - filename: .evergreen/config/build-tasks.yml + - filename: .evergreen/config/build-task-groups.yml - filename: .evergreen/config/build-variants.yml + - filename: .evergreen/config/test-tasks.yml - filename: .evergreen/config/test-task-groups.yml - filename: .evergreen/config/test-variants.yml diff --git a/.evergreen/config/build-task-groups.yml b/.evergreen/config/build-task-groups.yml new file mode 100644 index 000000000..d61ac7633 --- /dev/null +++ b/.evergreen/config/build-task-groups.yml @@ -0,0 +1,33 @@ +variables: + build_setup: &build_setup + - func: "fetch source" + - func: "prepare resources" + - func: "windows fix" + - func: "fix absolute paths" + - func: "make files executable" + - func: "install dependencies" + build_teardown: &build_teardown + - func: "upload working dir" + - func: "cleanup" + +task_groups: + - name: "build-all-php" + # Keep this number in sync with the number of PHP versions to allow for parallel builds + max_hosts: 4 + setup_task: *build_setup + setup_task_can_fail_task: true + setup_task_timeout_secs: 1800 + teardown_task: *build_teardown + tasks: + - ".build" + + - name: "build-php-openssl3" + # Keep this number in sync with the number of PHP versions to allow for parallel builds + # Subtract 2 versions as PHP 7.4 and 8.0 are not built with OpenSSL 3 + max_hosts: 2 + setup_task: *build_setup + setup_task_can_fail_task: true + setup_task_timeout_secs: 1800 + teardown_task: *build_teardown + tasks: + - ".build !.php7.4 !.php8.0" diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml index 748c7cca1..98ff817b7 100644 --- a/.evergreen/config/build-variants.yml +++ b/.evergreen/config/build-variants.yml @@ -7,68 +7,68 @@ buildvariants: display_name: "Build: Debian 11" run_on: debian11-small tasks: - - name: ".build" + - name: "build-all-php" - name: build-debian10 display_name: "Build: Debian 10" run_on: debian10-small tasks: - - name: ".build" + - name: "build-all-php" - name: build-debian92 display_name: "Build: Debian 9.2" run_on: debian92-small tasks: - - name: ".build" + - name: "build-all-php" # RHEL - name: build-rhel90 display_name: "Build: RHEL 9.0" run_on: rhel90-small tasks: - - name: ".build !.php7.4 !.php8.0" + - name: "build-php-openssl3" - name: build-rhel83-zseries display_name: "Build: RHEL 8.3 Zseries" run_on: rhel83-zseries-small tasks: - - name: ".build" + - name: "build-all-php" - name: build-rhel82-arm64 display_name: "Build: RHEL 8.2 ARM64" run_on: rhel82-arm64 tasks: - - name: ".build" + - name: "build-all-php" - name: build-rhel81-power8 display_name: "Build: RHEL 8.1 Power8" run_on: rhel81-power8-large tasks: - - name: ".build" + - name: "build-all-php" - name: build-rhel80 display_name: "Build: RHEL 8.0" run_on: rhel80-small tasks: - - name: ".build" + - name: "build-all-php" - name: build-rhel76 display_name: "Build: RHEL 7.6" run_on: rhel76-small tasks: - - name: ".build" + - name: "build-all-php" # Ubuntu LTS - name: build-ubuntu2204 display_name: "Build: Ubuntu 22.04 x64" run_on: ubuntu2204-small tasks: - - name: ".build !.php7.4 !.php8.0" + - name: "build-php-openssl3" - name: build-ubuntu2204-arm64 display_name: "Build: Ubuntu 22.04 ARM64" run_on: ubuntu2204-arm64-small tasks: - - name: ".build !.php7.4 !.php8.0" + - name: "build-php-openssl3" - name: build-ubuntu2004 display_name: "Build: Ubuntu 20.04 x64" run_on: ubuntu2004-small tasks: - - name: ".build" + - name: "build-all-php" - name: build-ubuntu2004-arm64 display_name: "Build: Ubuntu 20.04 ARM64" run_on: ubuntu2004-arm64-small tasks: - - name: ".build" + - name: "build-all-php" From 137fa474cb877f8295c9394062e28bb56215d3aa Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 20 Sep 2023 10:36:05 +0200 Subject: [PATCH 13/44] Add builds for different libmongoc versions --- .evergreen/config/build-task-groups.yml | 11 +++++++++ .evergreen/config/build-tasks.yml | 31 ++++++++++++++++++++++--- .evergreen/config/build-variants.yml | 1 + .evergreen/config/functions.yml | 21 ++++++++--------- 4 files changed, 50 insertions(+), 14 deletions(-) diff --git a/.evergreen/config/build-task-groups.yml b/.evergreen/config/build-task-groups.yml index d61ac7633..bbb242597 100644 --- a/.evergreen/config/build-task-groups.yml +++ b/.evergreen/config/build-task-groups.yml @@ -11,6 +11,7 @@ variables: - func: "cleanup" task_groups: + # Builds all versions of PHP - name: "build-all-php" # Keep this number in sync with the number of PHP versions to allow for parallel builds max_hosts: 4 @@ -21,6 +22,7 @@ task_groups: tasks: - ".build" + # Builds all versions of PHP that support OpenSSL 3 (PHP 8.1+) - name: "build-php-openssl3" # Keep this number in sync with the number of PHP versions to allow for parallel builds # Subtract 2 versions as PHP 7.4 and 8.0 are not built with OpenSSL 3 @@ -31,3 +33,12 @@ task_groups: teardown_task: *build_teardown tasks: - ".build !.php7.4 !.php8.0" + + # Builds PHP 8.2 with different versions of libmongoc + - name: "build-php-8.2-libmongoc" + setup_task: *build_setup + setup_task_can_fail_task: true + setup_task_timeout_secs: 1800 + teardown_task: *build_teardown + tasks: + - ".build-libmongoc .php8.2" diff --git a/.evergreen/config/build-tasks.yml b/.evergreen/config/build-tasks.yml index 6ec889724..3eb63471a 100644 --- a/.evergreen/config/build-tasks.yml +++ b/.evergreen/config/build-tasks.yml @@ -1,4 +1,5 @@ tasks: + # Standard builds for all PHP versions - name: "build-php-8.2" tags: ["build", "php8.2"] commands: @@ -6,7 +7,6 @@ tasks: vars: PHP_VERSION: "8.2" - func: "upload build" - - name: "build-php-8.1" tags: ["build", "php8.1"] commands: @@ -14,7 +14,6 @@ tasks: vars: PHP_VERSION: "8.1" - func: "upload build" - - name: "build-php-8.0" tags: ["build", "php8.0"] commands: @@ -22,7 +21,6 @@ tasks: vars: PHP_VERSION: "8.0" - func: "upload build" - - name: "build-php-7.4" tags: ["build", "php7.4"] commands: @@ -30,3 +28,30 @@ tasks: vars: PHP_VERSION: "7.4" - func: "upload build" + + # Special builds with different libmongoc versions + # TODO: Enable the following two builds once libmongoc 1.25.0 is released +# - name: "build-php-8.2-libmongoc-lowest-supported" +# tags: ["build-libmongoc", "php8.2"] +# commands: +# - func: "compile driver" +# vars: +# PHP_VERSION: "8.2" +# LIBMONGOC_VERSION: "1.25.0" +# - func: "upload build" +# - name: "build-php-8.2-libmongoc-next-stable" +# tags: ["build-libmongoc", "php8.2"] +# commands: +# - func: "compile driver" +# vars: +# PHP_VERSION: "8.2" +# LIBMONGOC_VERSION: "r1.25" +# - func: "upload build" + - name: "build-php-8.2-libmongoc-latest" + tags: ["build-libmongoc", "php8.2"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.2" + LIBMONGOC_VERSION: "master" + - func: "upload build" diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml index 98ff817b7..25c7dbe9a 100644 --- a/.evergreen/config/build-variants.yml +++ b/.evergreen/config/build-variants.yml @@ -8,6 +8,7 @@ buildvariants: run_on: debian11-small tasks: - name: "build-all-php" + - name: "build-php-8.2-libmongoc" - name: build-debian10 display_name: "Build: Debian 10" run_on: debian10-small diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml index efcc9afaf..d3f15d4c4 100644 --- a/.evergreen/config/functions.yml +++ b/.evergreen/config/functions.yml @@ -10,17 +10,6 @@ functions: working_dir: "src" script: | git submodule update --init - # Switch to a different version of libmongoc - - command: shell.exec - params: - working_dir: "src/src/libmongoc" - script: | - if [ -n "${LIBMONGOC_VERSION}" ]; then - echo "Checking out libmongoc version: ${LIBMONGOC_VERSION}" - git fetch - git checkout ${LIBMONGOC_VERSION} - # Note: compile-unix.sh will run `make libmongoc-version-current` - fi # Make an evergreen expansion file with dynamic values - command: shell.exec params: @@ -146,6 +135,16 @@ functions: perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" Makefile "compile driver" : + - command: shell.exec + params: + working_dir: "src/src/libmongoc" + script: | + if [ -n "${LIBMONGOC_VERSION}" ]; then + echo "Checking out libmongoc version: ${LIBMONGOC_VERSION}" + git fetch + git checkout ${LIBMONGOC_VERSION} + # Note: compile-unix.sh will run `make libmongoc-version-current` + fi - command: subprocess.exec type: test params: From dbda695d27872242c4d243f55ead3bcf58ffa208 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 20 Sep 2023 10:39:24 +0200 Subject: [PATCH 14/44] Test MongoDB 7.0 on Debian 11 --- .evergreen/config.yml | 18 ++++++++++ .evergreen/config/test-tasks.yml | 56 ++++++++++++++--------------- .evergreen/config/test-variants.yml | 42 +++++++++++++++++++--- 3 files changed, 84 insertions(+), 32 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 11145096a..3bcc075c5 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -11,6 +11,24 @@ command_type: system # for various build variants exec_timeout_secs: 1800 +# These pre and post rules apply to all tasks not part of a task group, which should only ever be tests against local +# MongoDB instances. All other tasks that require special preparation should be run from within a task group +pre: &test_setup + - func: "fetch source" + - func: "prepare resources" + - func: "windows fix" + - func: "fix absolute paths" + - func: "init test-results" + - func: "make files executable" + - func: "install dependencies" + - func: "fetch build" +post: &test_teardown + - func: "upload mo artifacts" + - func: "upload test results" + - func: "stop mongo-orchestration" + - func: "upload working dir" + - func: "cleanup" + include: - filename: .evergreen/config/functions.yml diff --git a/.evergreen/config/test-tasks.yml b/.evergreen/config/test-tasks.yml index fe94b65a1..64880448c 100644 --- a/.evergreen/config/test-tasks.yml +++ b/.evergreen/config/test-tasks.yml @@ -9,7 +9,7 @@ tasks: MONGODB_VERSION: "latest" - func: "run tests" - name: "test-mongodb-latest-standalone-auth" - tags: ["standalone", "local", "latest"] + tags: ["standalone", "local", "latest", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -18,7 +18,7 @@ tasks: MONGODB_VERSION: "latest" - func: "run tests" - name: "test-mongodb-latest-standalone-ssl" - tags: ["standalone", "local", "latest"] + tags: ["standalone", "local", "latest", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -37,7 +37,7 @@ tasks: MONGODB_VERSION: "latest" - func: "run tests" - name: "test-mongodb-latest-replicaset-auth" - tags: ["replicaset", "local", "latest"] + tags: ["replicaset", "local", "latest", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -46,7 +46,7 @@ tasks: MONGODB_VERSION: "latest" - func: "run tests" - name: "test-mongodb-latest-sharded-noauth-nossl" - tags: ["sharded", "local", "latest"] + tags: ["sharded", "local", "latest", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -64,7 +64,7 @@ tasks: MONGODB_VERSION: "rapid" - func: "run tests" - name: "test-mongodb-rapid-standalone-auth" - tags: ["standalone", "local", "rapid"] + tags: ["standalone", "local", "rapid", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -73,7 +73,7 @@ tasks: MONGODB_VERSION: "rapid" - func: "run tests" - name: "test-mongodb-rapid-standalone-ssl" - tags: ["standalone", "local", "rapid"] + tags: ["standalone", "local", "rapid", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -92,7 +92,7 @@ tasks: MONGODB_VERSION: "rapid" - func: "run tests" - name: "test-mongodb-rapid-replicaset-auth" - tags: ["replicaset", "local", "rapid"] + tags: ["replicaset", "local", "rapid", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -119,7 +119,7 @@ tasks: MONGODB_VERSION: "7.0" - func: "run tests" - name: "test-mongodb-7.0-standalone-auth" - tags: ["standalone", "local", "7.0"] + tags: ["standalone", "local", "7.0", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -128,7 +128,7 @@ tasks: MONGODB_VERSION: "7.0" - func: "run tests" - name: "test-mongodb-7.0-standalone-ssl" - tags: ["standalone", "local", "7.0"] + tags: ["standalone", "local", "7.0", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -147,7 +147,7 @@ tasks: MONGODB_VERSION: "7.0" - func: "run tests" - name: "test-mongodb-7.0-replicaset-auth" - tags: ["replicaset", "local", "7.0"] + tags: ["replicaset", "local", "7.0", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -174,7 +174,7 @@ tasks: MONGODB_VERSION: "6.0" - func: "run tests" - name: "test-mongodb-6.0-standalone-auth" - tags: ["standalone", "local", "6.0"] + tags: ["standalone", "local", "6.0", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -183,7 +183,7 @@ tasks: MONGODB_VERSION: "6.0" - func: "run tests" - name: "test-mongodb-6.0-standalone-ssl" - tags: ["standalone", "local", "6.0"] + tags: ["standalone", "local", "6.0", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -202,7 +202,7 @@ tasks: MONGODB_VERSION: "6.0" - func: "run tests" - name: "test-mongodb-6.0-replicaset-auth" - tags: ["replicaset", "local", "6.0"] + tags: ["replicaset", "local", "6.0", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -229,7 +229,7 @@ tasks: MONGODB_VERSION: "5.0" - func: "run tests" - name: "test-mongodb-5.0-standalone-auth" - tags: ["standalone", "local", "5.0"] + tags: ["standalone", "local", "5.0", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -238,7 +238,7 @@ tasks: MONGODB_VERSION: "5.0" - func: "run tests" - name: "test-mongodb-5.0-standalone-ssl" - tags: ["standalone", "local", "5.0"] + tags: ["standalone", "local", "5.0", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -257,7 +257,7 @@ tasks: MONGODB_VERSION: "5.0" - func: "run tests" - name: "test-mongodb-5.0-replicaset-auth" - tags: ["replicaset", "local", "5.0"] + tags: ["replicaset", "local", "5.0", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -284,7 +284,7 @@ tasks: MONGODB_VERSION: "4.4" - func: "run tests" - name: "test-mongodb-4.4-standalone-auth" - tags: ["standalone", "local", "4.4"] + tags: ["standalone", "local", "4.4", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -293,7 +293,7 @@ tasks: MONGODB_VERSION: "4.4" - func: "run tests" - name: "test-mongodb-4.4-standalone-ssl" - tags: ["standalone", "local", "4.4"] + tags: ["standalone", "local", "4.4", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -312,7 +312,7 @@ tasks: MONGODB_VERSION: "4.4" - func: "run tests" - name: "test-mongodb-4.4-replicaset-auth" - tags: ["replicaset", "local", "4.4"] + tags: ["replicaset", "local", "4.4", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -339,7 +339,7 @@ tasks: MONGODB_VERSION: "4.2" - func: "run tests" - name: "test-mongodb-4.2-standalone-auth" - tags: ["standalone", "local", "4.2"] + tags: ["standalone", "local", "4.2", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -348,7 +348,7 @@ tasks: MONGODB_VERSION: "4.2" - func: "run tests" - name: "test-mongodb-4.2-standalone-ssl" - tags: ["standalone", "local", "4.2"] + tags: ["standalone", "local", "4.2", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -367,7 +367,7 @@ tasks: MONGODB_VERSION: "4.2" - func: "run tests" - name: "test-mongodb-4.2-replicaset-auth" - tags: ["replicaset", "local", "4.2"] + tags: ["replicaset", "local", "4.2", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -394,7 +394,7 @@ tasks: MONGODB_VERSION: "4.0" - func: "run tests" - name: "test-mongodb-4.0-standalone-auth" - tags: ["standalone", "local", "4.0"] + tags: ["standalone", "local", "4.0", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -403,7 +403,7 @@ tasks: MONGODB_VERSION: "4.0" - func: "run tests" - name: "test-mongodb-4.0-standalone-ssl" - tags: ["standalone", "local", "4.0"] + tags: ["standalone", "local", "4.0", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -422,7 +422,7 @@ tasks: MONGODB_VERSION: "4.0" - func: "run tests" - name: "test-mongodb-4.0-replicaset-auth" - tags: ["replicaset", "local", "4.0"] + tags: ["replicaset", "local", "4.0", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -449,7 +449,7 @@ tasks: MONGODB_VERSION: "3.6" - func: "run tests" - name: "test-mongodb-3.6-standalone-auth" - tags: ["standalone", "local", "3.6"] + tags: ["standalone", "local", "3.6", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -458,7 +458,7 @@ tasks: MONGODB_VERSION: "3.6" - func: "run tests" - name: "test-mongodb-3.6-standalone-ssl" - tags: ["standalone", "local", "3.6"] + tags: ["standalone", "local", "3.6", "ssl"] commands: - func: "bootstrap mongo-orchestration" vars: @@ -477,7 +477,7 @@ tasks: MONGODB_VERSION: "3.6" - func: "run tests" - name: "test-mongodb-3.6-replicaset-auth" - tags: ["replicaset", "local", "3.6"] + tags: ["replicaset", "local", "3.6", "auth"] commands: - func: "bootstrap mongo-orchestration" vars: diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml index 2d5505994..091a08636 100644 --- a/.evergreen/config/test-variants.yml +++ b/.evergreen/config/test-variants.yml @@ -1,7 +1,8 @@ +# +# Test variants - only run for select platforms worth testing on +# buildvariants: - # - # Test variants - only run for select platforms worth testing on - # + # Test MongoDB 7.0 replica sets on Debian 11 for all PHP versions - name: test-debian11-php82-local display_name: "Test: Debian 11, PHP 8.2" run_on: debian11-small @@ -12,4 +13,37 @@ buildvariants: - variant: "build-debian11" name: "build-php-8.2" tasks: - - name: "test-local-deployment-7.0" + - ".replicaset .local .7.0 .auth" + - name: test-debian11-php81-local + display_name: "Test: Debian 11, PHP 8.1" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.1" + depends_on: + - variant: "build-debian11" + name: "build-php-8.1" + tasks: + - ".replicaset .local .7.0 .auth" + - name: test-debian11-php80-local + display_name: "Test: Debian 11, PHP 8.0" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.0" + depends_on: + - variant: "build-debian11" + name: "build-php-8.0" + tasks: + - ".replicaset .local .7.0 .auth" + - name: test-debian11-php74-local + display_name: "Test: Debian 11, PHP 7.4" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-7.4" + depends_on: + - variant: "build-debian11" + name: "build-php-7.4" + tasks: + - ".replicaset .local .7.0 .auth" From 9376fb2f1bd158b7296fd234b23b7b5d12662f09 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 20 Sep 2023 10:56:55 +0200 Subject: [PATCH 15/44] Move Atlas Connectivity and crypt_shared tests to new format --- .evergreen/config/legacy-tasks.yml | 19 ---------- .evergreen/config/legacy-variants.yml | 31 --------------- .evergreen/config/test-tasks.yml | 54 +++++++++++++++++++++++++++ .evergreen/config/test-variants.yml | 23 +++++++++++- 4 files changed, 75 insertions(+), 52 deletions(-) diff --git a/.evergreen/config/legacy-tasks.yml b/.evergreen/config/legacy-tasks.yml index 372f46a2e..a172b68ab 100644 --- a/.evergreen/config/legacy-tasks.yml +++ b/.evergreen/config/legacy-tasks.yml @@ -1,23 +1,4 @@ tasks: - - name: "test-atlas" - tags: ["atlas"] - commands: - - func: "compile driver" - - func: "decrypt atlas URI list" - - func: "run tests" - vars: - TESTS: "tests/atlas.phpt" - - - name: "test-skip_crypt_shared" - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - name: "test-loadBalanced" tags: ["loadbalanced"] commands: diff --git a/.evergreen/config/legacy-variants.yml b/.evergreen/config/legacy-variants.yml index 705f5ae36..36ab916b5 100644 --- a/.evergreen/config/legacy-variants.yml +++ b/.evergreen/config/legacy-variants.yml @@ -108,22 +108,6 @@ buildvariants: - name: "test-replicaset-auth" - name: "test-sharded" - # Test all topologies and MongoDB versions with latest-stable PHP version on Debian - - matrix_name: "test-mongodb-versions" - matrix_spec: { "os": ["debian92", "debian11"], "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "${os}, ${mongodb-versions}, ${php-edge-versions}" - exclude_spec: - # Debian 9.2 only supports up to MongoDB 5.0 - - { "os": "debian92", "mongodb-versions": ["6.0", "7.0", "rapid", "latest"], "php-edge-versions": "latest-stable" } - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-standalone" - - name: "test-standalone-auth" - - name: "test-standalone-ssl" - - name: "test-replicaset" - - name: "test-replicaset-auth" - - name: "test-sharded" - # Test alternative storage engines on MongoDB 4.0 - matrix_name: "test-storage-engines" matrix_spec: { "os": "debian92", "mongodb-versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": ["inmemory", "mmapv1"] } @@ -139,12 +123,6 @@ buildvariants: - name: "test-replicaset-auth" - name: "test-sharded" - - matrix_name: "atlas-connectivity-tests" - matrix_spec: { "os": "debian11", "php-edge-versions": "latest-stable" } - display_name: "Atlas Connectivity" - tasks: - - name: "test-atlas" - - matrix_name: "test-ocsp" matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } display_name: "OCSP tests - ${mongodb-versions}" @@ -171,12 +149,3 @@ buildvariants: - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } tasks: - name: "test-loadBalanced" - - - matrix_name: "test-csfle-skip_crypt_shared" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "CSFLE skip_crypt_shared - ${mongodb-versions}" - exclude_spec: - # CSFLE crypt_shared is available from MongoDB 6.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4", "5.0"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-skip_crypt_shared" diff --git a/.evergreen/config/test-tasks.yml b/.evergreen/config/test-tasks.yml index 64880448c..9028e8bbe 100644 --- a/.evergreen/config/test-tasks.yml +++ b/.evergreen/config/test-tasks.yml @@ -493,3 +493,57 @@ tasks: TOPOLOGY: "sharded_cluster" MONGODB_VERSION: "3.6" - func: "run tests" + + # Other tasks + - name: "test-atlas-connectivity" + tags: ["atlas", "nodb"] + commands: + - func: "decrypt atlas URI list" + - func: "run tests" + vars: + TESTS: "tests/atlas.phpt" + + # Tests without crypt_shared library + - name: "test-skip_crypt_shared-latest" + tags: ["replicaset", "local", "latest", "skip_crypt_shared"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "latest" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" + + - name: "test-skip_crypt_shared-rapid" + tags: ["replicaset", "local", "rapid", "skip_crypt_shared"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "rapid" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" + + - name: "test-skip_crypt_shared-7.0" + tags: ["replicaset", "local", "7.0", "skip_crypt_shared"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "7.0" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" + + - name: "test-skip_crypt_shared-6.0" + tags: ["replicaset", "local", "6.0", "skip_crypt_shared"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "6.0" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml index 091a08636..56c92c0fa 100644 --- a/.evergreen/config/test-variants.yml +++ b/.evergreen/config/test-variants.yml @@ -2,7 +2,7 @@ # Test variants - only run for select platforms worth testing on # buildvariants: - # Test MongoDB 7.0 replica sets on Debian 11 for all PHP versions + # PHP 8.2: test all topologies on all versions of MongoDB - name: test-debian11-php82-local display_name: "Test: Debian 11, PHP 8.2" run_on: debian11-small @@ -13,7 +13,26 @@ buildvariants: - variant: "build-debian11" name: "build-php-8.2" tasks: - - ".replicaset .local .7.0 .auth" + - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - "test-atlas-connectivity" + - name: test-debian92-php82-local + display_name: "Test: Debian 9.2, PHP 8.2" + run_on: debian92-small + expansions: + FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_TASK: "build-php-8.2" + depends_on: + - variant: "build-debian92" + name: "build-php-8.2" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" + - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" + - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" + + # Test remaining PHP versions with replica sets on Debian 11 with MongoDB 7.0 - name: test-debian11-php81-local display_name: "Test: Debian 11, PHP 8.1" run_on: debian11-small From c06b7e798a504873bb9ccb52791e925e197acb2d Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 20 Sep 2023 11:18:54 +0200 Subject: [PATCH 16/44] Move storage engine and libmongoc variants to new format --- .evergreen/config/build-task-groups.yml | 2 + .evergreen/config/functions.yml | 2 +- .evergreen/config/legacy-variants.yml | 95 ------------------------- .evergreen/config/test-tasks.yml | 20 ++++++ .evergreen/config/test-variants.yml | 36 ++++++++++ 5 files changed, 59 insertions(+), 96 deletions(-) diff --git a/.evergreen/config/build-task-groups.yml b/.evergreen/config/build-task-groups.yml index bbb242597..234b4604b 100644 --- a/.evergreen/config/build-task-groups.yml +++ b/.evergreen/config/build-task-groups.yml @@ -36,6 +36,8 @@ task_groups: # Builds PHP 8.2 with different versions of libmongoc - name: "build-php-8.2-libmongoc" + # Keep this in sync with the actual number of libmongoc builds (typically 3) + max_hosts: 1 setup_task: *build_setup setup_task_can_fail_task: true setup_task_timeout_secs: 1800 diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml index d3f15d4c4..4fd3ecfb3 100644 --- a/.evergreen/config/functions.yml +++ b/.evergreen/config/functions.yml @@ -60,7 +60,6 @@ functions: export PROJECT="${project}" export SSL_DIR="$DRIVERS_TOOLS/.evergreen/x509gen" - export LIBMONGOC_VERSION="${LIBMONGOC_VERSION}" EOT # See what we've done cat expansion.yml @@ -138,6 +137,7 @@ functions: - command: shell.exec params: working_dir: "src/src/libmongoc" + add_expansions_to_env: true script: | if [ -n "${LIBMONGOC_VERSION}" ]; then echo "Checking out libmongoc version: ${LIBMONGOC_VERSION}" diff --git a/.evergreen/config/legacy-variants.yml b/.evergreen/config/legacy-variants.yml index 36ab916b5..aec1c69a8 100644 --- a/.evergreen/config/legacy-variants.yml +++ b/.evergreen/config/legacy-variants.yml @@ -1,84 +1,3 @@ -axes: - - id: os - display_name: OS - values: - # Debian - - id: debian11 - display_name: "Debian 11" - run_on: debian11-small - - id: debian10 - display_name: "Debian 10" - run_on: debian10-small - - id: debian92 - display_name: "Debian 9.2" - run_on: debian92-small - - # RHEL - - id: rhel90 - display_name: "RHEL 9.0" - run_on: rhel90-small - - id: rhel83-zseries - display_name: "RHEL 8.3 Zseries" - run_on: rhel83-zseries-small - - id: rhel82-arm64 - display_name: "RHEL 8.2 ARM64" - run_on: rhel82-arm64-small - - id: rhel81-power8 - display_name: "RHEL 8.1 Power8" - run_on: rhel81-power8-large - - id: rhel80 - display_name: "RHEL 8.0" - run_on: rhel80-small - - id: rhel76 - display_name: "RHEL 7.6" - run_on: rhel76-small - - # Ubuntu LTS - - id: ubuntu2204 - display_name: "Ubuntu 22.04 x64" - run_on: ubuntu2204-small - - id: ubuntu2204-arm64 - display_name: "Ubuntu 22.04 ARM64" - run_on: ubuntu2204-arm64-small - - id: ubuntu2004 - display_name: "Ubuntu 20.04 x64" - run_on: ubuntu2004-small - - id: ubuntu2004-arm64 - display_name: "Ubuntu 20.04 ARM64" - run_on: ubuntu2004-arm64-small - - - id: storage-engine - display_name: Storage - values: - - id: mmapv1 - display_name: MMAPv1 - variables: - STORAGE_ENGINE: "mmapv1" - - id: wiredtiger - display_name: WiredTiger - variables: - STORAGE_ENGINE: "wiredtiger" - - id: inmemory - display_name: InMemory - variables: - STORAGE_ENGINE: "inmemory" - - - id: libmongoc-version - display_name: libmongoc version - values: - - id: "lowest-supported" - display_name: "1.25-dev" - variables: - LIBMONGOC_VERSION: "master" -# - id: "upcoming-stable" -# display_name: "1.25-dev" -# variables: -# LIBMONGOC_VERSION: "r1.25" -# - id: "latest-dev" -# display_name: "master" -# variables: -# LIBMONGOC_VERSION: "master" - buildvariants: - matrix_name: "test-php-versions" matrix_spec: @@ -109,20 +28,6 @@ buildvariants: - name: "test-sharded" # Test alternative storage engines on MongoDB 4.0 - - matrix_name: "test-storage-engines" - matrix_spec: { "os": "debian92", "mongodb-versions": "4.0", "php-edge-versions": "latest-stable", "storage-engine": ["inmemory", "mmapv1"] } - display_name: "${storage-engine}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" - tasks: - - name: "test-standalone" - - - matrix_name: "libmongoc-versions" - matrix_spec: { "os": "debian11", "mongodb-edge-versions": "latest-stable", "php-edge-versions": "latest-stable", "libmongoc-version": "*" } - display_name: "libmongoc ${libmongoc-version}: ${os}, ${mongodb-edge-versions}, ${php-edge-versions}" - tasks: - - name: "test-standalone-ssl" - - name: "test-replicaset-auth" - - name: "test-sharded" - - matrix_name: "test-ocsp" matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } display_name: "OCSP tests - ${mongodb-versions}" diff --git a/.evergreen/config/test-tasks.yml b/.evergreen/config/test-tasks.yml index 9028e8bbe..287da4079 100644 --- a/.evergreen/config/test-tasks.yml +++ b/.evergreen/config/test-tasks.yml @@ -547,3 +547,23 @@ tasks: - func: "run tests" vars: SKIP_CRYPT_SHARED: "yes" + + # Test different storage engines + - name: "test-mongodb-4.0-standalone-inmemory" + tags: ["standalone", "local", "4.0", "storage-engines"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.0" + STORAGE_ENGINE: "inmemory" + - func: "run tests" + - name: "test-mongodb-4.0-standalone-mmapv1" + tags: ["standalone", "local", "4.0", "storage-engines"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.0" + STORAGE_ENGINE: "mmapv1" + - func: "run tests" diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml index 56c92c0fa..51f3e5e4e 100644 --- a/.evergreen/config/test-variants.yml +++ b/.evergreen/config/test-variants.yml @@ -66,3 +66,39 @@ buildvariants: name: "build-php-7.4" tasks: - ".replicaset .local .7.0 .auth" + + # Variants with different libmongoc + # TODO: Enable the following two builds once libmongoc 1.25.0 is released +# - name: test-debian11-php82-local-libmongoc-lowest-supported +# display_name: "Test: Debian 11, PHP 8.2, libmongoc lowest" +# run_on: debian11-small +# expansions: +# FETCH_BUILD_VARIANT: "build-debian11" +# FETCH_BUILD_TASK: "build-php-8.2-libmongoc-lowest-supported" +# depends_on: +# - variant: "build-debian11" +# name: "build-php-8.2-libmongoc-lowest-supported" +# tasks: +# - ".replicaset .local .7.0 .auth" +# - name: test-debian11-php82-local-libmongoc-next-stable +# display_name: "Test: Debian 11, PHP 8.2, libmongoc next stable" +# run_on: debian11-small +# expansions: +# FETCH_BUILD_VARIANT: "build-debian11" +# FETCH_BUILD_TASK: "build-php-8.2-libmongoc-next-stable" +# depends_on: +# - variant: "build-debian11" +# name: "build-php-8.2-libmongoc-next-stable" +# tasks: +# - ".replicaset .local .7.0 .auth" + - name: test-debian11-php82-local-libmongoc-latest + display_name: "Test: Debian 11, PHP 8.2, libmongoc latest" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.2-libmongoc-latest" + depends_on: + - variant: "build-debian11" + name: "build-php-8.2-libmongoc-latest" + tasks: + - ".replicaset .local .7.0 .auth" From 74f3e0400abbc60b212d09407eecb13ee57f5dd3 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 20 Sep 2023 11:31:21 +0200 Subject: [PATCH 17/44] Run smoketest after build --- .evergreen/compile-unix.sh | 2 +- tests/smoketest.phpt | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tests/smoketest.phpt diff --git a/.evergreen/compile-unix.sh b/.evergreen/compile-unix.sh index 0c06a212c..8f3707858 100755 --- a/.evergreen/compile-unix.sh +++ b/.evergreen/compile-unix.sh @@ -73,4 +73,4 @@ if [ -n "$LIBMONGOC_VERSION" ]; then make libmongoc-version-current fi -make +make test TESTS="tests/smoketest.phpt" diff --git a/tests/smoketest.phpt b/tests/smoketest.phpt new file mode 100644 index 000000000..160a44241 --- /dev/null +++ b/tests/smoketest.phpt @@ -0,0 +1,11 @@ +--TEST-- +Smoke test to make sure compilation succeeded +--FILE-- + +===DONE=== + +--EXPECT-- +bool(true) +===DONE=== From 9535c734fe39f8eb107fc999cffca341ce6656ab Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 22 Sep 2023 10:40:59 +0200 Subject: [PATCH 18/44] Extract generatable tasks --- .evergreen/config.yml | 12 + .evergreen/config/test-tasks.yml | 541 ------------------- .evergreen/config/test/local-3.6.yml | 56 ++ .evergreen/config/test/local-4.0.yml | 56 ++ .evergreen/config/test/local-4.2.yml | 56 ++ .evergreen/config/test/local-4.4.yml | 56 ++ .evergreen/config/test/local-5.0.yml | 56 ++ .evergreen/config/test/local-6.0.yml | 56 ++ .evergreen/config/test/local-7.0.yml | 56 ++ .evergreen/config/test/local-latest.yml | 56 ++ .evergreen/config/test/local-rapid.yml | 56 ++ .evergreen/config/test/skip-crypt-shared.yml | 44 ++ 12 files changed, 560 insertions(+), 541 deletions(-) create mode 100644 .evergreen/config/test/local-3.6.yml create mode 100644 .evergreen/config/test/local-4.0.yml create mode 100644 .evergreen/config/test/local-4.2.yml create mode 100644 .evergreen/config/test/local-4.4.yml create mode 100644 .evergreen/config/test/local-5.0.yml create mode 100644 .evergreen/config/test/local-6.0.yml create mode 100644 .evergreen/config/test/local-7.0.yml create mode 100644 .evergreen/config/test/local-latest.yml create mode 100644 .evergreen/config/test/local-rapid.yml create mode 100644 .evergreen/config/test/skip-crypt-shared.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 3bcc075c5..00f8daf68 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -36,6 +36,18 @@ include: - filename: .evergreen/config/build-task-groups.yml - filename: .evergreen/config/build-variants.yml + # Local deployments - these files are generated automatically + - filename: .evergreen/config/test/local-latest.yml + - filename: .evergreen/config/test/local-rapid.yml + - filename: .evergreen/config/test/local-7.0.yml + - filename: .evergreen/config/test/local-6.0.yml + - filename: .evergreen/config/test/local-5.0.yml + - filename: .evergreen/config/test/local-4.4.yml + - filename: .evergreen/config/test/local-4.2.yml + - filename: .evergreen/config/test/local-4.0.yml + - filename: .evergreen/config/test/local-3.6.yml + - filename: .evergreen/config/test/skip-crypt-shared.yml + - filename: .evergreen/config/test-tasks.yml - filename: .evergreen/config/test-task-groups.yml - filename: .evergreen/config/test-variants.yml diff --git a/.evergreen/config/test-tasks.yml b/.evergreen/config/test-tasks.yml index 287da4079..a3963ad2a 100644 --- a/.evergreen/config/test-tasks.yml +++ b/.evergreen/config/test-tasks.yml @@ -1,500 +1,4 @@ tasks: - # MongoDB latest - - name: "test-mongodb-latest-standalone-noauth-nossl" - tags: ["standalone", "local", "latest"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "latest" - - func: "run tests" - - name: "test-mongodb-latest-standalone-auth" - tags: ["standalone", "local", "latest", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "latest" - - func: "run tests" - - name: "test-mongodb-latest-standalone-ssl" - tags: ["standalone", "local", "latest", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "latest" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-latest-replicaset-noauth-nossl" - tags: ["replicaset", "local", "latest"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "latest" - - func: "run tests" - - name: "test-mongodb-latest-replicaset-auth" - tags: ["replicaset", "local", "latest", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "latest" - - func: "run tests" - - name: "test-mongodb-latest-sharded-noauth-nossl" - tags: ["sharded", "local", "latest", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "latest" - - func: "run tests" - - # MongoDB Rapid Release - - name: "test-mongodb-rapid-standalone-noauth-nossl" - tags: ["standalone", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "rapid" - - func: "run tests" - - name: "test-mongodb-rapid-standalone-auth" - tags: ["standalone", "local", "rapid", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "rapid" - - func: "run tests" - - name: "test-mongodb-rapid-standalone-ssl" - tags: ["standalone", "local", "rapid", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "rapid" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-rapid-replicaset-noauth-nossl" - tags: ["replicaset", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "rapid" - - func: "run tests" - - name: "test-mongodb-rapid-replicaset-auth" - tags: ["replicaset", "local", "rapid", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "rapid" - - func: "run tests" - - name: "test-mongodb-rapid-sharded-noauth-nossl" - tags: ["sharded", "local", "rapid"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "rapid" - - func: "run tests" - - # MongoDB 7.0 - - name: "test-mongodb-7.0-standalone-noauth-nossl" - tags: ["standalone", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "7.0" - - func: "run tests" - - name: "test-mongodb-7.0-standalone-auth" - tags: ["standalone", "local", "7.0", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "7.0" - - func: "run tests" - - name: "test-mongodb-7.0-standalone-ssl" - tags: ["standalone", "local", "7.0", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "7.0" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-7.0-replicaset-noauth-nossl" - tags: ["replicaset", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "7.0" - - func: "run tests" - - name: "test-mongodb-7.0-replicaset-auth" - tags: ["replicaset", "local", "7.0", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "7.0" - - func: "run tests" - - name: "test-mongodb-7.0-sharded-noauth-nossl" - tags: ["sharded", "local", "7.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "7.0" - - func: "run tests" - - # MongoDB 6.0 - - name: "test-mongodb-6.0-standalone-noauth-nossl" - tags: ["standalone", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "6.0" - - func: "run tests" - - name: "test-mongodb-6.0-standalone-auth" - tags: ["standalone", "local", "6.0", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "6.0" - - func: "run tests" - - name: "test-mongodb-6.0-standalone-ssl" - tags: ["standalone", "local", "6.0", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "6.0" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-6.0-replicaset-noauth-nossl" - tags: ["replicaset", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "6.0" - - func: "run tests" - - name: "test-mongodb-6.0-replicaset-auth" - tags: ["replicaset", "local", "6.0", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "6.0" - - func: "run tests" - - name: "test-mongodb-6.0-sharded-noauth-nossl" - tags: ["sharded", "local", "6.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "6.0" - - func: "run tests" - - # MongoDB 5.0 - - name: "test-mongodb-5.0-standalone-noauth-nossl" - tags: ["standalone", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "5.0" - - func: "run tests" - - name: "test-mongodb-5.0-standalone-auth" - tags: ["standalone", "local", "5.0", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "5.0" - - func: "run tests" - - name: "test-mongodb-5.0-standalone-ssl" - tags: ["standalone", "local", "5.0", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "5.0" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-5.0-replicaset-noauth-nossl" - tags: ["replicaset", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "5.0" - - func: "run tests" - - name: "test-mongodb-5.0-replicaset-auth" - tags: ["replicaset", "local", "5.0", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "5.0" - - func: "run tests" - - name: "test-mongodb-5.0-sharded-noauth-nossl" - tags: ["sharded", "local", "5.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "5.0" - - func: "run tests" - - # MongoDB 4.4 - - name: "test-mongodb-4.4-standalone-noauth-nossl" - tags: ["standalone", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "4.4" - - func: "run tests" - - name: "test-mongodb-4.4-standalone-auth" - tags: ["standalone", "local", "4.4", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "4.4" - - func: "run tests" - - name: "test-mongodb-4.4-standalone-ssl" - tags: ["standalone", "local", "4.4", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "4.4" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-4.4-replicaset-noauth-nossl" - tags: ["replicaset", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "4.4" - - func: "run tests" - - name: "test-mongodb-4.4-replicaset-auth" - tags: ["replicaset", "local", "4.4", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "4.4" - - func: "run tests" - - name: "test-mongodb-4.4-sharded-noauth-nossl" - tags: ["sharded", "local", "4.4"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "4.4" - - func: "run tests" - - # MongoDB 4.2 - - name: "test-mongodb-4.2-standalone-noauth-nossl" - tags: ["standalone", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "4.2" - - func: "run tests" - - name: "test-mongodb-4.2-standalone-auth" - tags: ["standalone", "local", "4.2", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "4.2" - - func: "run tests" - - name: "test-mongodb-4.2-standalone-ssl" - tags: ["standalone", "local", "4.2", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "4.2" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-4.2-replicaset-noauth-nossl" - tags: ["replicaset", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "4.2" - - func: "run tests" - - name: "test-mongodb-4.2-replicaset-auth" - tags: ["replicaset", "local", "4.2", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "4.2" - - func: "run tests" - - name: "test-mongodb-4.2-sharded-noauth-nossl" - tags: ["sharded", "local", "4.2"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "4.2" - - func: "run tests" - - # MongoDB 4.0 - - name: "test-mongodb-4.0-standalone-noauth-nossl" - tags: ["standalone", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "4.0" - - func: "run tests" - - name: "test-mongodb-4.0-standalone-auth" - tags: ["standalone", "local", "4.0", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "4.0" - - func: "run tests" - - name: "test-mongodb-4.0-standalone-ssl" - tags: ["standalone", "local", "4.0", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "4.0" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-4.0-replicaset-noauth-nossl" - tags: ["replicaset", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "4.0" - - func: "run tests" - - name: "test-mongodb-4.0-replicaset-auth" - tags: ["replicaset", "local", "4.0", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "4.0" - - func: "run tests" - - name: "test-mongodb-4.0-sharded-noauth-nossl" - tags: ["sharded", "local", "4.0"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "4.0" - - func: "run tests" - - # MongoDB 3.6 - - name: "test-mongodb-3.6-standalone-noauth-nossl" - tags: ["standalone", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "3.6" - - func: "run tests" - - name: "test-mongodb-3.6-standalone-auth" - tags: ["standalone", "local", "3.6", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "3.6" - - func: "run tests" - - name: "test-mongodb-3.6-standalone-ssl" - tags: ["standalone", "local", "3.6", "ssl"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "3.6" - - func: "run tests" - vars: - SSL: "yes" - - name: "test-mongodb-3.6-replicaset-noauth-nossl" - tags: ["replicaset", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "3.6" - - func: "run tests" - - name: "test-mongodb-3.6-replicaset-auth" - tags: ["replicaset", "local", "3.6", "auth"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "3.6" - - func: "run tests" - - name: "test-mongodb-3.6-sharded-noauth-nossl" - tags: ["sharded", "local", "3.6"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "3.6" - - func: "run tests" - - # Other tasks - name: "test-atlas-connectivity" tags: ["atlas", "nodb"] commands: @@ -503,51 +7,6 @@ tasks: vars: TESTS: "tests/atlas.phpt" - # Tests without crypt_shared library - - name: "test-skip_crypt_shared-latest" - tags: ["replicaset", "local", "latest", "skip_crypt_shared"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "latest" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - - name: "test-skip_crypt_shared-rapid" - tags: ["replicaset", "local", "rapid", "skip_crypt_shared"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "rapid" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - - name: "test-skip_crypt_shared-7.0" - tags: ["replicaset", "local", "7.0", "skip_crypt_shared"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "7.0" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - - name: "test-skip_crypt_shared-6.0" - tags: ["replicaset", "local", "6.0", "skip_crypt_shared"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "6.0" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - # Test different storage engines - name: "test-mongodb-4.0-standalone-inmemory" tags: ["standalone", "local", "4.0", "storage-engines"] diff --git a/.evergreen/config/test/local-3.6.yml b/.evergreen/config/test/local-3.6.yml new file mode 100644 index 000000000..a2f5d82e4 --- /dev/null +++ b/.evergreen/config/test/local-3.6.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-3.6-standalone-noauth-nossl" + tags: ["standalone", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-3.6-standalone-auth" + tags: ["standalone", "local", "3.6", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-3.6-standalone-ssl" + tags: ["standalone", "local", "3.6", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "3.6" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-3.6-replicaset-noauth-nossl" + tags: ["replicaset", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "3.6" + - func: "run tests" + - name: "test-mongodb-3.6-replicaset-auth" + tags: ["replicaset", "local", "3.6", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "3.6" + - func: "run tests" + + - name: "test-mongodb-3.6-sharded-noauth-nossl" + tags: ["sharded", "local", "3.6"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "3.6" + - func: "run tests" diff --git a/.evergreen/config/test/local-4.0.yml b/.evergreen/config/test/local-4.0.yml new file mode 100644 index 000000000..b823874c7 --- /dev/null +++ b/.evergreen/config/test/local-4.0.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-4.0-standalone-noauth-nossl" + tags: ["standalone", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-4.0-standalone-auth" + tags: ["standalone", "local", "4.0", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-4.0-standalone-ssl" + tags: ["standalone", "local", "4.0", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.0" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-4.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.0" + - func: "run tests" + - name: "test-mongodb-4.0-replicaset-auth" + tags: ["replicaset", "local", "4.0", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.0" + - func: "run tests" + + - name: "test-mongodb-4.0-sharded-noauth-nossl" + tags: ["sharded", "local", "4.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.0" + - func: "run tests" diff --git a/.evergreen/config/test/local-4.2.yml b/.evergreen/config/test/local-4.2.yml new file mode 100644 index 000000000..1b1943968 --- /dev/null +++ b/.evergreen/config/test/local-4.2.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-4.2-standalone-noauth-nossl" + tags: ["standalone", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-4.2-standalone-auth" + tags: ["standalone", "local", "4.2", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-4.2-standalone-ssl" + tags: ["standalone", "local", "4.2", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.2" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-4.2-replicaset-noauth-nossl" + tags: ["replicaset", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.2" + - func: "run tests" + - name: "test-mongodb-4.2-replicaset-auth" + tags: ["replicaset", "local", "4.2", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.2" + - func: "run tests" + + - name: "test-mongodb-4.2-sharded-noauth-nossl" + tags: ["sharded", "local", "4.2"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.2" + - func: "run tests" diff --git a/.evergreen/config/test/local-4.4.yml b/.evergreen/config/test/local-4.4.yml new file mode 100644 index 000000000..7d6c87765 --- /dev/null +++ b/.evergreen/config/test/local-4.4.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-4.4-standalone-noauth-nossl" + tags: ["standalone", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-4.4-standalone-auth" + tags: ["standalone", "local", "4.4", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-4.4-standalone-ssl" + tags: ["standalone", "local", "4.4", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "4.4" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-4.4-replicaset-noauth-nossl" + tags: ["replicaset", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "4.4" + - func: "run tests" + - name: "test-mongodb-4.4-replicaset-auth" + tags: ["replicaset", "local", "4.4", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "4.4" + - func: "run tests" + + - name: "test-mongodb-4.4-sharded-noauth-nossl" + tags: ["sharded", "local", "4.4"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "4.4" + - func: "run tests" diff --git a/.evergreen/config/test/local-5.0.yml b/.evergreen/config/test/local-5.0.yml new file mode 100644 index 000000000..a409c1bb2 --- /dev/null +++ b/.evergreen/config/test/local-5.0.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-5.0-standalone-noauth-nossl" + tags: ["standalone", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-5.0-standalone-auth" + tags: ["standalone", "local", "5.0", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-5.0-standalone-ssl" + tags: ["standalone", "local", "5.0", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "5.0" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-5.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "5.0" + - func: "run tests" + - name: "test-mongodb-5.0-replicaset-auth" + tags: ["replicaset", "local", "5.0", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "5.0" + - func: "run tests" + + - name: "test-mongodb-5.0-sharded-noauth-nossl" + tags: ["sharded", "local", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "5.0" + - func: "run tests" diff --git a/.evergreen/config/test/local-6.0.yml b/.evergreen/config/test/local-6.0.yml new file mode 100644 index 000000000..09abce69b --- /dev/null +++ b/.evergreen/config/test/local-6.0.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-6.0-standalone-noauth-nossl" + tags: ["standalone", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-6.0-standalone-auth" + tags: ["standalone", "local", "6.0", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-6.0-standalone-ssl" + tags: ["standalone", "local", "6.0", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "6.0" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-6.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "6.0" + - func: "run tests" + - name: "test-mongodb-6.0-replicaset-auth" + tags: ["replicaset", "local", "6.0", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "6.0" + - func: "run tests" + + - name: "test-mongodb-6.0-sharded-noauth-nossl" + tags: ["sharded", "local", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "6.0" + - func: "run tests" diff --git a/.evergreen/config/test/local-7.0.yml b/.evergreen/config/test/local-7.0.yml new file mode 100644 index 000000000..8800dfef7 --- /dev/null +++ b/.evergreen/config/test/local-7.0.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-7.0-standalone-noauth-nossl" + tags: ["standalone", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-7.0-standalone-auth" + tags: ["standalone", "local", "7.0", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-7.0-standalone-ssl" + tags: ["standalone", "local", "7.0", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "7.0" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-7.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "7.0" + - func: "run tests" + - name: "test-mongodb-7.0-replicaset-auth" + tags: ["replicaset", "local", "7.0", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "7.0" + - func: "run tests" + + - name: "test-mongodb-7.0-sharded-noauth-nossl" + tags: ["sharded", "local", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "7.0" + - func: "run tests" diff --git a/.evergreen/config/test/local-latest.yml b/.evergreen/config/test/local-latest.yml new file mode 100644 index 000000000..5053c56ac --- /dev/null +++ b/.evergreen/config/test/local-latest.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-latest-standalone-noauth-nossl" + tags: ["standalone", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "latest" + - func: "run tests" + - name: "test-mongodb-latest-standalone-auth" + tags: ["standalone", "local", "latest", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "latest" + - func: "run tests" + - name: "test-mongodb-latest-standalone-ssl" + tags: ["standalone", "local", "latest", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "latest" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-latest-replicaset-noauth-nossl" + tags: ["replicaset", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "latest" + - func: "run tests" + - name: "test-mongodb-latest-replicaset-auth" + tags: ["replicaset", "local", "latest", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "latest" + - func: "run tests" + + - name: "test-mongodb-latest-sharded-noauth-nossl" + tags: ["sharded", "local", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "latest" + - func: "run tests" diff --git a/.evergreen/config/test/local-rapid.yml b/.evergreen/config/test/local-rapid.yml new file mode 100644 index 000000000..3cb0708d2 --- /dev/null +++ b/.evergreen/config/test/local-rapid.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-rapid-standalone-noauth-nossl" + tags: ["standalone", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-standalone-auth" + tags: ["standalone", "local", "rapid", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-standalone-ssl" + tags: ["standalone", "local", "rapid", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "rapid" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-rapid-replicaset-noauth-nossl" + tags: ["replicaset", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "rapid" + - func: "run tests" + - name: "test-mongodb-rapid-replicaset-auth" + tags: ["replicaset", "local", "rapid", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "rapid" + - func: "run tests" + + - name: "test-mongodb-rapid-sharded-noauth-nossl" + tags: ["sharded", "local", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "rapid" + - func: "run tests" diff --git a/.evergreen/config/test/skip-crypt-shared.yml b/.evergreen/config/test/skip-crypt-shared.yml new file mode 100644 index 000000000..c679e5008 --- /dev/null +++ b/.evergreen/config/test/skip-crypt-shared.yml @@ -0,0 +1,44 @@ +tasks: + - name: "test-skip_crypt_shared-latest" + tags: [ "replicaset", "local", "latest", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "latest" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" + + - name: "test-skip_crypt_shared-rapid" + tags: [ "replicaset", "local", "rapid", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "rapid" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" + + - name: "test-skip_crypt_shared-7.0" + tags: [ "replicaset", "local", "7.0", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "7.0" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" + + - name: "test-skip_crypt_shared-6.0" + tags: [ "replicaset", "local", "6.0", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "6.0" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" From 4a20f4eb36ade0cd1dab2ba06475ed0e013a0786 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 22 Sep 2023 10:57:00 +0200 Subject: [PATCH 19/44] Remove obsolete file --- .evergreen/config.yml | 1 - .evergreen/config/test-task-groups.yml | 23 ----------------------- 2 files changed, 24 deletions(-) delete mode 100644 .evergreen/config/test-task-groups.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 00f8daf68..fcae01928 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -49,5 +49,4 @@ include: - filename: .evergreen/config/test/skip-crypt-shared.yml - filename: .evergreen/config/test-tasks.yml - - filename: .evergreen/config/test-task-groups.yml - filename: .evergreen/config/test-variants.yml diff --git a/.evergreen/config/test-task-groups.yml b/.evergreen/config/test-task-groups.yml deleted file mode 100644 index b8b469110..000000000 --- a/.evergreen/config/test-task-groups.yml +++ /dev/null @@ -1,23 +0,0 @@ -task_groups: - - name: "test-local-deployment-7.0" - setup_group: - - func: "fetch source" - - func: "prepare resources" - - func: "windows fix" - - func: "fix absolute paths" - - func: "init test-results" - - func: "make files executable" - - func: "install dependencies" - - func: "fetch build" - teardown_group: - - func: "upload mo artifacts" - - func: "upload test results" - - func: "stop mongo-orchestration" - - func: "upload working dir" - - func: "cleanup" - setup_group_can_fail_task: true - setup_group_timeout_secs: 1800 - tasks: - - ".standalone .local .7.0" - - ".replicaset .local .7.0" - - ".sharded .local .7.0" From bebb155fa243810e72c649b2e4704d1838e72a59 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 22 Sep 2023 11:02:16 +0200 Subject: [PATCH 20/44] Remove obsolete variant --- .evergreen/config/legacy-variants.yml | 28 --------------------------- 1 file changed, 28 deletions(-) diff --git a/.evergreen/config/legacy-variants.yml b/.evergreen/config/legacy-variants.yml index aec1c69a8..ab4c0607f 100644 --- a/.evergreen/config/legacy-variants.yml +++ b/.evergreen/config/legacy-variants.yml @@ -1,32 +1,4 @@ buildvariants: - - matrix_name: "test-php-versions" - matrix_spec: - os: - - debian11 - - debian10 - - rhel90 - - rhel83-zseries - - rhel82-arm64 - - rhel81-power8 - - rhel80 - - rhel76 - - ubuntu2204-arm64 - - ubuntu2204 - - ubuntu2004-arm64 - - ubuntu2004 - mongodb-edge-versions: latest-stable - php-versions: "*" - display_name: "${os}, ${mongodb-edge-versions}, ${php-versions}" - exclude_spec: - # Exclude "latest-stable" PHP version for Debian 11 (see: test-mongodb-versions matrix) - - { "os": "debian11", "mongodb-edge-versions": "*", "php-versions": "8.2" } - # Exclude PHP versions older than 8.1 on RHEL 9 and Ubuntu 22.04 (OpenSSL 3 is only supported on PHP 8.1+) - - { "os": ["rhel90", "ubuntu2204-arm64", "ubuntu2204"], "mongodb-edge-versions": "*", "php-versions": ["7.4", "8.0"] } - tasks: - - name: "test-standalone-ssl" - - name: "test-replicaset-auth" - - name: "test-sharded" - # Test alternative storage engines on MongoDB 4.0 - matrix_name: "test-ocsp" matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } From 6fa232484a29ffcb1ad5dc840770e4abad48411a Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 22 Sep 2023 11:07:17 +0200 Subject: [PATCH 21/44] Move requireApiVersion tests to new format --- .evergreen/config.yml | 1 + .evergreen/config/legacy-tasks.yml | 13 ---- .evergreen/config/legacy-variants.yml | 9 --- .../config/test/require-api-version.yml | 65 +++++++++++++++++++ 4 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 .evergreen/config/test/require-api-version.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index fcae01928..5748d1c0f 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -47,6 +47,7 @@ include: - filename: .evergreen/config/test/local-4.0.yml - filename: .evergreen/config/test/local-3.6.yml - filename: .evergreen/config/test/skip-crypt-shared.yml + - filename: .evergreen/config/test/require-api-version.yml - filename: .evergreen/config/test-tasks.yml - filename: .evergreen/config/test-variants.yml diff --git a/.evergreen/config/legacy-tasks.yml b/.evergreen/config/legacy-tasks.yml index a172b68ab..c8fc95698 100644 --- a/.evergreen/config/legacy-tasks.yml +++ b/.evergreen/config/legacy-tasks.yml @@ -16,19 +16,6 @@ tasks: SSL: "yes" # Note: "stop load balancer" will be called from "post" - - name: "test-requireApiVersion" - tags: ["versioned_api"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - REQUIRE_API_VERSION: "yes" - - func: "run tests" - vars: - API_VERSION: "1" - - name: "ocsp-test_1-rsa-delegate" tags: ["ocsp"] commands: diff --git a/.evergreen/config/legacy-variants.yml b/.evergreen/config/legacy-variants.yml index ab4c0607f..beb8302c2 100644 --- a/.evergreen/config/legacy-variants.yml +++ b/.evergreen/config/legacy-variants.yml @@ -9,15 +9,6 @@ buildvariants: tasks: - name: ".ocsp" - - matrix_name: "test-requireApiVersion" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "Versioned API - ${mongodb-versions}" - exclude_spec: - # Stable API is available from MongoDB 5.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-requireApiVersion" - - matrix_name: "test-loadBalanced" matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } display_name: "Load balanced - ${mongodb-versions}" diff --git a/.evergreen/config/test/require-api-version.yml b/.evergreen/config/test/require-api-version.yml new file mode 100644 index 000000000..8a824d1a5 --- /dev/null +++ b/.evergreen/config/test/require-api-version.yml @@ -0,0 +1,65 @@ +tasks: + - name: "test-requireApiVersion-latest" + tags: [ "standalone", "local", "latest", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "latest" + - func: "run tests" + vars: + API_VERSION: "1" + + - name: "test-requireApiVersion-rapid" + tags: [ "standalone", "local", "rapid", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "rapid" + - func: "run tests" + vars: + API_VERSION: "1" + + - name: "test-requireApiVersion-7.0" + tags: [ "standalone", "local", "7.0", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "7.0" + - func: "run tests" + vars: + API_VERSION: "1" + + - name: "test-requireApiVersion-6.0" + tags: [ "standalone", "local", "6.0", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "6.0" + - func: "run tests" + vars: + API_VERSION: "1" + + - name: "test-requireApiVersion-5.0" + tags: [ "standalone", "local", "5.0", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "5.0" + - func: "run tests" + vars: + API_VERSION: "1" From 81614c02d1b501d9d9bef96ac5976d64941902ab Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 22 Sep 2023 11:12:24 +0200 Subject: [PATCH 22/44] Move loadbalanced tests to new format --- .evergreen/config.yml | 2 + .evergreen/config/legacy-tasks.yml | 17 ------ .evergreen/config/legacy-variants.yml | 9 --- .evergreen/config/test/load-balanced.yml | 77 ++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 26 deletions(-) create mode 100644 .evergreen/config/test/load-balanced.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 5748d1c0f..b2e7234c5 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -26,6 +26,7 @@ post: &test_teardown - func: "upload mo artifacts" - func: "upload test results" - func: "stop mongo-orchestration" + - func: "stop load balancer" - func: "upload working dir" - func: "cleanup" @@ -48,6 +49,7 @@ include: - filename: .evergreen/config/test/local-3.6.yml - filename: .evergreen/config/test/skip-crypt-shared.yml - filename: .evergreen/config/test/require-api-version.yml + - filename: .evergreen/config/test/load-balanced.yml - filename: .evergreen/config/test-tasks.yml - filename: .evergreen/config/test-variants.yml diff --git a/.evergreen/config/legacy-tasks.yml b/.evergreen/config/legacy-tasks.yml index c8fc95698..f9776fd1c 100644 --- a/.evergreen/config/legacy-tasks.yml +++ b/.evergreen/config/legacy-tasks.yml @@ -1,21 +1,4 @@ tasks: - - name: "test-loadBalanced" - tags: ["loadbalanced"] - commands: - - func: "compile driver" - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - LOAD_BALANCER: "true" - SSL: "yes" - - func: "start load balancer" - - func: "run tests" - vars: - # Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI - MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" - SSL: "yes" - # Note: "stop load balancer" will be called from "post" - - name: "ocsp-test_1-rsa-delegate" tags: ["ocsp"] commands: diff --git a/.evergreen/config/legacy-variants.yml b/.evergreen/config/legacy-variants.yml index beb8302c2..a816f1bbb 100644 --- a/.evergreen/config/legacy-variants.yml +++ b/.evergreen/config/legacy-variants.yml @@ -8,12 +8,3 @@ buildvariants: - { "os": "debian10", "mongodb-versions": ["3.6", "4.0", "4.2"], "php-edge-versions": "latest-stable" } tasks: - name: ".ocsp" - - - matrix_name: "test-loadBalanced" - matrix_spec: { "os": "debian11", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "Load balanced - ${mongodb-versions}" - exclude_spec: - # Load balancer is available from MongoDB 5.0+ - - { "os": "debian11", "mongodb-versions": ["3.6", "4.0", "4.2", "4.4"], "php-edge-versions": "latest-stable" } - tasks: - - name: "test-loadBalanced" diff --git a/.evergreen/config/test/load-balanced.yml b/.evergreen/config/test/load-balanced.yml new file mode 100644 index 000000000..843f0256b --- /dev/null +++ b/.evergreen/config/test/load-balanced.yml @@ -0,0 +1,77 @@ +tasks: + - name: "test-mongodb-latest-loadbalanced" + tags: ["sharded", "local", "latest", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "latest" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" + + - name: "test-mongodb-rapid-loadbalanced" + tags: ["sharded", "local", "rapid", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "rapid" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" + # Note: "stop load balancer" will be called from "post" + + - name: "test-mongodb-7.0-loadbalanced" + tags: ["sharded", "local", "7.0", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "7.0" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" + + - name: "test-mongodb-6.0-loadbalanced" + tags: ["sharded", "local", "6.0", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "6.0" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" + + - name: "test-mongodb-5.0-loadbalanced" + tags: ["sharded", "local", "5.0", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "5.0" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + # Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" From 214b8f50480883d5fd6903a01e2a41c50090e872 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 22 Sep 2023 12:52:52 +0200 Subject: [PATCH 23/44] Move OCSP tests to new format --- .evergreen/config.yml | 6 + .evergreen/config/legacy-variants.yml | 10 - .evergreen/config/test-variants.yml | 22 + .../{legacy-tasks.yml => test/ocsp-4.4.yml} | 144 +++---- .evergreen/config/test/ocsp-5.0.yml | 389 ++++++++++++++++++ .evergreen/config/test/ocsp-6.0.yml | 389 ++++++++++++++++++ .evergreen/config/test/ocsp-7.0.yml | 389 ++++++++++++++++++ .evergreen/config/test/ocsp-latest.yml | 389 ++++++++++++++++++ .evergreen/config/test/ocsp-rapid.yml | 389 ++++++++++++++++++ 9 files changed, 2045 insertions(+), 82 deletions(-) delete mode 100644 .evergreen/config/legacy-variants.yml rename .evergreen/config/{legacy-tasks.yml => test/ocsp-4.4.yml} (81%) create mode 100644 .evergreen/config/test/ocsp-5.0.yml create mode 100644 .evergreen/config/test/ocsp-6.0.yml create mode 100644 .evergreen/config/test/ocsp-7.0.yml create mode 100644 .evergreen/config/test/ocsp-latest.yml create mode 100644 .evergreen/config/test/ocsp-rapid.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index b2e7234c5..312ad14f4 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -50,6 +50,12 @@ include: - filename: .evergreen/config/test/skip-crypt-shared.yml - filename: .evergreen/config/test/require-api-version.yml - filename: .evergreen/config/test/load-balanced.yml + - filename: .evergreen/config/test/ocsp-latest.yml + - filename: .evergreen/config/test/ocsp-rapid.yml + - filename: .evergreen/config/test/ocsp-7.0.yml + - filename: .evergreen/config/test/ocsp-6.0.yml + - filename: .evergreen/config/test/ocsp-5.0.yml + - filename: .evergreen/config/test/ocsp-4.4.yml - filename: .evergreen/config/test-tasks.yml - filename: .evergreen/config/test-variants.yml diff --git a/.evergreen/config/legacy-variants.yml b/.evergreen/config/legacy-variants.yml deleted file mode 100644 index a816f1bbb..000000000 --- a/.evergreen/config/legacy-variants.yml +++ /dev/null @@ -1,10 +0,0 @@ -buildvariants: - # Test alternative storage engines on MongoDB 4.0 - - matrix_name: "test-ocsp" - matrix_spec: { "os": "debian10", "mongodb-versions": "*", "php-edge-versions": "latest-stable" } - display_name: "OCSP tests - ${mongodb-versions}" - exclude_spec: - # OCSP is available from MongoDB 4.4+ (Debian 10 has MongoDB 4.4+) - - { "os": "debian10", "mongodb-versions": ["3.6", "4.0", "4.2"], "php-edge-versions": "latest-stable" } - tasks: - - name: ".ocsp" diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml index 51f3e5e4e..84d5adedf 100644 --- a/.evergreen/config/test-variants.yml +++ b/.evergreen/config/test-variants.yml @@ -17,6 +17,23 @@ buildvariants: - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - "test-atlas-connectivity" + - ".ocsp !.4.4" + display_tasks: + - name: "test-ocsp-latest" + execution_tasks: + - ".ocsp .latest" + - name: "test-ocsp-rapid" + execution_tasks: + - ".ocsp .rapid" + - name: "test-ocsp-7.0" + execution_tasks: + - ".ocsp .7.0" + - name: "test-ocsp-6.0" + execution_tasks: + - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" - name: test-debian92-php82-local display_name: "Test: Debian 9.2, PHP 8.2" run_on: debian92-small @@ -31,6 +48,11 @@ buildvariants: - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" + - ".ocsp !.6.0 !.7.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-4.4" + execution_tasks: + - ".ocsp .4.4" # Test remaining PHP versions with replica sets on Debian 11 with MongoDB 7.0 - name: test-debian11-php81-local diff --git a/.evergreen/config/legacy-tasks.yml b/.evergreen/config/test/ocsp-4.4.yml similarity index 81% rename from .evergreen/config/legacy-tasks.yml rename to .evergreen/config/test/ocsp-4.4.yml index f9776fd1c..8242b50ae 100644 --- a/.evergreen/config/legacy-tasks.yml +++ b/.evergreen/config/test/ocsp-4.4.yml @@ -1,8 +1,7 @@ tasks: - - name: "ocsp-test_1-rsa-delegate" - tags: ["ocsp"] + - name: "ocsp-test_1-rsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_1" @@ -10,16 +9,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_1-ecdsa-delegate" - tags: ["ocsp"] + - name: "ocsp-test_1-ecdsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_1" @@ -27,16 +26,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_1-rsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-test_1-rsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_1" @@ -44,16 +43,16 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_1-ecdsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-test_1-ecdsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_1" @@ -61,16 +60,16 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_2-rsa-delegate" - tags: ["ocsp"] + - name: "ocsp-test_2-rsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_2" @@ -78,16 +77,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_2-ecdsa-delegate" - tags: ["ocsp"] + - name: "ocsp-test_2-ecdsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_2" @@ -95,16 +94,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_2-rsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-test_2-rsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_2" @@ -112,16 +111,16 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_2-ecdsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-test_2-ecdsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_2" @@ -129,16 +128,16 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_3-rsa-delegate" - tags: ["ocsp"] + - name: "ocsp-test_3-rsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_3" @@ -146,16 +145,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_3-ecdsa-delegate" - tags: ["ocsp"] + - name: "ocsp-test_3-ecdsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_3" @@ -163,16 +162,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_3-rsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-test_3-rsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_3" @@ -180,16 +179,16 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_3-ecdsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-test_3-ecdsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_3" @@ -197,16 +196,16 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_4-rsa-delegate" - tags: ["ocsp"] + - name: "ocsp-test_4-rsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_4" @@ -214,16 +213,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_4-ecdsa-delegate" - tags: ["ocsp"] + - name: "ocsp-test_4-ecdsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_4" @@ -231,16 +230,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-test_4-rsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-test_4-rsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_4" @@ -248,16 +247,16 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-test_4-ecdsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-test_4-ecdsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "TEST_4" @@ -265,40 +264,40 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-soft_fail_test-rsa" - tags: ["ocsp"] + - name: "ocsp-soft_fail_test-rsa-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-soft_fail_test-ecdsa" - tags: ["ocsp"] + - name: "ocsp-soft_fail_test-ecdsa-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_1-rsa-delegate" - tags: ["ocsp"] + - name: "ocsp-malicious_server_test_1-rsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" @@ -306,16 +305,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_1-ecdsa-delegate" - tags: ["ocsp"] + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" @@ -323,16 +322,16 @@ tasks: USE_DELEGATE: "on" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_1-rsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" @@ -340,16 +339,16 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate" - tags: ["ocsp"] + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "run OCSP responder" vars: TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" @@ -357,30 +356,31 @@ tasks: USE_DELEGATE: "off" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - - name: "ocsp-malicious_server_test_2-rsa" - tags: ["ocsp"] + - name: "ocsp-malicious_server_test_2-rsa-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" - func: "run tests" vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" - - name: "ocsp-malicious_server_test_2-ecdsa" - tags: ["ocsp"] + - name: "ocsp-malicious_server_test_2-ecdsa-4.4" + tags: ["ocsp", "4.4"] commands: - - func: "compile driver" - func: "bootstrap mongo-orchestration" vars: + MONGODB_VERSION: "4.4" TOPOLOGY: "server" ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" - func: "run tests" diff --git a/.evergreen/config/test/ocsp-5.0.yml b/.evergreen/config/test/ocsp-5.0.yml new file mode 100644 index 000000000..096b1d125 --- /dev/null +++ b/.evergreen/config/test/ocsp-5.0.yml @@ -0,0 +1,389 @@ +tasks: + - name: "ocsp-test_1-rsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-5.0" + tags: ["ocsp", "5.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "5.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" diff --git a/.evergreen/config/test/ocsp-6.0.yml b/.evergreen/config/test/ocsp-6.0.yml new file mode 100644 index 000000000..5dce9495e --- /dev/null +++ b/.evergreen/config/test/ocsp-6.0.yml @@ -0,0 +1,389 @@ +tasks: + - name: "ocsp-test_1-rsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-6.0" + tags: ["ocsp", "6.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "6.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" diff --git a/.evergreen/config/test/ocsp-7.0.yml b/.evergreen/config/test/ocsp-7.0.yml new file mode 100644 index 000000000..a299c84f9 --- /dev/null +++ b/.evergreen/config/test/ocsp-7.0.yml @@ -0,0 +1,389 @@ +tasks: + - name: "ocsp-test_1-rsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-7.0" + tags: ["ocsp", "7.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "7.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" diff --git a/.evergreen/config/test/ocsp-latest.yml b/.evergreen/config/test/ocsp-latest.yml new file mode 100644 index 000000000..0c516dc93 --- /dev/null +++ b/.evergreen/config/test/ocsp-latest.yml @@ -0,0 +1,389 @@ +tasks: + - name: "ocsp-test_1-rsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-latest" + tags: ["ocsp", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-latest" + tags: ["ocsp", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-latest" + tags: ["ocsp", "latest"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-latest" + tags: ["ocsp", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-latest" + tags: ["ocsp", "latest"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "latest" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" diff --git a/.evergreen/config/test/ocsp-rapid.yml b/.evergreen/config/test/ocsp-rapid.yml new file mode 100644 index 000000000..012ec571c --- /dev/null +++ b/.evergreen/config/test/ocsp-rapid.yml @@ -0,0 +1,389 @@ +tasks: + - name: "ocsp-test_1-rsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-rapid" + tags: ["ocsp", "rapid"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "rapid" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" From 7443aced86d09e5decfb10e7937068f9ff1f7330 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 25 Sep 2023 13:41:33 +0200 Subject: [PATCH 24/44] Generate test and build tasks from templates --- .evergreen/config.yml | 31 +- .../build/_template-build-libmongoc.yml | 26 ++ .../config/build/_template-build-php.yml | 8 + .../build-libmongoc-8.2.yml} | 32 +- .evergreen/config/build/build-php-7.4.yml | 9 + .evergreen/config/build/build-php-8.0.yml | 9 + .evergreen/config/build/build-php-8.1.yml | 9 + .evergreen/config/build/build-php-8.2.yml | 9 + .evergreen/config/generate-config.php | 75 ++++ .../config/test/_template-load-balanced.yml | 15 + .evergreen/config/test/_template-local.yml | 56 +++ .evergreen/config/test/_template-ocsp.yml | 389 ++++++++++++++++++ .../test/_template-require-api-version.yml | 13 + .../test/_template-skip-crypt-shared.yml | 11 + .evergreen/config/test/load-balanced-5.0.yml | 16 + .evergreen/config/test/load-balanced-6.0.yml | 16 + .evergreen/config/test/load-balanced-7.0.yml | 16 + .../config/test/load-balanced-latest.yml | 16 + .../config/test/load-balanced-rapid.yml | 16 + .evergreen/config/test/load-balanced.yml | 77 ---- .evergreen/config/test/loadbalanced-5.0.yml | 0 .evergreen/config/test/loadbalanced-6.0.yml | 0 .evergreen/config/test/loadbalanced-7.0.yml | 0 .../config/test/loadbalanced-latest.yml | 0 .evergreen/config/test/loadbalanced-rapid.yml | 0 .evergreen/config/test/local-3.6.yml | 1 + .evergreen/config/test/local-4.0.yml | 1 + .evergreen/config/test/local-4.2.yml | 1 + .evergreen/config/test/local-4.4.yml | 1 + .evergreen/config/test/local-5.0.yml | 1 + .evergreen/config/test/local-6.0.yml | 1 + .evergreen/config/test/local-7.0.yml | 1 + .evergreen/config/test/local-latest.yml | 1 + .evergreen/config/test/local-rapid.yml | 1 + .evergreen/config/test/ocsp-4.4.yml | 1 + .evergreen/config/test/ocsp-5.0.yml | 1 + .evergreen/config/test/ocsp-6.0.yml | 1 + .evergreen/config/test/ocsp-7.0.yml | 1 + .evergreen/config/test/ocsp-latest.yml | 1 + .evergreen/config/test/ocsp-rapid.yml | 1 + .../config/test/require-api-version-5.0.yml | 14 + .../config/test/require-api-version-6.0.yml | 14 + .../config/test/require-api-version-7.0.yml | 14 + .../test/require-api-version-latest.yml | 14 + .../config/test/require-api-version-rapid.yml | 14 + .../config/test/require-api-version.yml | 65 --- .../config/test/skip-crypt-shared-6.0.yml | 12 + .../config/test/skip-crypt-shared-7.0.yml | 12 + .../config/test/skip-crypt-shared-latest.yml | 12 + .../config/test/skip-crypt-shared-rapid.yml | 12 + .evergreen/config/test/skip-crypt-shared.yml | 44 -- 51 files changed, 866 insertions(+), 225 deletions(-) create mode 100644 .evergreen/config/build/_template-build-libmongoc.yml create mode 100644 .evergreen/config/build/_template-build-php.yml rename .evergreen/config/{build-tasks.yml => build/build-libmongoc-8.2.yml} (51%) create mode 100644 .evergreen/config/build/build-php-7.4.yml create mode 100644 .evergreen/config/build/build-php-8.0.yml create mode 100644 .evergreen/config/build/build-php-8.1.yml create mode 100644 .evergreen/config/build/build-php-8.2.yml create mode 100644 .evergreen/config/generate-config.php create mode 100644 .evergreen/config/test/_template-load-balanced.yml create mode 100644 .evergreen/config/test/_template-local.yml create mode 100644 .evergreen/config/test/_template-ocsp.yml create mode 100644 .evergreen/config/test/_template-require-api-version.yml create mode 100644 .evergreen/config/test/_template-skip-crypt-shared.yml create mode 100644 .evergreen/config/test/load-balanced-5.0.yml create mode 100644 .evergreen/config/test/load-balanced-6.0.yml create mode 100644 .evergreen/config/test/load-balanced-7.0.yml create mode 100644 .evergreen/config/test/load-balanced-latest.yml create mode 100644 .evergreen/config/test/load-balanced-rapid.yml delete mode 100644 .evergreen/config/test/load-balanced.yml create mode 100644 .evergreen/config/test/loadbalanced-5.0.yml create mode 100644 .evergreen/config/test/loadbalanced-6.0.yml create mode 100644 .evergreen/config/test/loadbalanced-7.0.yml create mode 100644 .evergreen/config/test/loadbalanced-latest.yml create mode 100644 .evergreen/config/test/loadbalanced-rapid.yml create mode 100644 .evergreen/config/test/require-api-version-5.0.yml create mode 100644 .evergreen/config/test/require-api-version-6.0.yml create mode 100644 .evergreen/config/test/require-api-version-7.0.yml create mode 100644 .evergreen/config/test/require-api-version-latest.yml create mode 100644 .evergreen/config/test/require-api-version-rapid.yml delete mode 100644 .evergreen/config/test/require-api-version.yml create mode 100644 .evergreen/config/test/skip-crypt-shared-6.0.yml create mode 100644 .evergreen/config/test/skip-crypt-shared-7.0.yml create mode 100644 .evergreen/config/test/skip-crypt-shared-latest.yml create mode 100644 .evergreen/config/test/skip-crypt-shared-rapid.yml delete mode 100644 .evergreen/config/test/skip-crypt-shared.yml diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 312ad14f4..0efe6cb3e 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -33,11 +33,18 @@ post: &test_teardown include: - filename: .evergreen/config/functions.yml - - filename: .evergreen/config/build-tasks.yml - filename: .evergreen/config/build-task-groups.yml - filename: .evergreen/config/build-variants.yml - # Local deployments - these files are generated automatically + - filename: .evergreen/config/test-tasks.yml + - filename: .evergreen/config/test-variants.yml + + # Automatically generated files + - filename: .evergreen/config/build/build-php-8.2.yml + - filename: .evergreen/config/build/build-php-8.1.yml + - filename: .evergreen/config/build/build-php-8.0.yml + - filename: .evergreen/config/build/build-php-7.4.yml + - filename: .evergreen/config/build/build-libmongoc-8.2.yml - filename: .evergreen/config/test/local-latest.yml - filename: .evergreen/config/test/local-rapid.yml - filename: .evergreen/config/test/local-7.0.yml @@ -47,15 +54,23 @@ include: - filename: .evergreen/config/test/local-4.2.yml - filename: .evergreen/config/test/local-4.0.yml - filename: .evergreen/config/test/local-3.6.yml - - filename: .evergreen/config/test/skip-crypt-shared.yml - - filename: .evergreen/config/test/require-api-version.yml - - filename: .evergreen/config/test/load-balanced.yml + - filename: .evergreen/config/test/load-balanced-latest.yml + - filename: .evergreen/config/test/load-balanced-rapid.yml + - filename: .evergreen/config/test/load-balanced-7.0.yml + - filename: .evergreen/config/test/load-balanced-6.0.yml + - filename: .evergreen/config/test/load-balanced-5.0.yml - filename: .evergreen/config/test/ocsp-latest.yml - filename: .evergreen/config/test/ocsp-rapid.yml - filename: .evergreen/config/test/ocsp-7.0.yml - filename: .evergreen/config/test/ocsp-6.0.yml - filename: .evergreen/config/test/ocsp-5.0.yml - filename: .evergreen/config/test/ocsp-4.4.yml - - - filename: .evergreen/config/test-tasks.yml - - filename: .evergreen/config/test-variants.yml + - filename: .evergreen/config/test/require-api-version-latest.yml + - filename: .evergreen/config/test/require-api-version-rapid.yml + - filename: .evergreen/config/test/require-api-version-7.0.yml + - filename: .evergreen/config/test/require-api-version-6.0.yml + - filename: .evergreen/config/test/require-api-version-5.0.yml + - filename: .evergreen/config/test/skip-crypt-shared-latest.yml + - filename: .evergreen/config/test/skip-crypt-shared-rapid.yml + - filename: .evergreen/config/test/skip-crypt-shared-7.0.yml + - filename: .evergreen/config/test/skip-crypt-shared-6.0.yml diff --git a/.evergreen/config/build/_template-build-libmongoc.yml b/.evergreen/config/build/_template-build-libmongoc.yml new file mode 100644 index 000000000..35aa539b5 --- /dev/null +++ b/.evergreen/config/build/_template-build-libmongoc.yml @@ -0,0 +1,26 @@ +tasks: + # TODO: Enable the following two builds once libmongoc 1.25.0 is released +# - name: "build-php-%phpVersion%-libmongoc-lowest-supported" +# tags: ["build-libmongoc", "php%phpVersion%"] +# commands: +# - func: "compile driver" +# vars: +# PHP_VERSION: "%phpVersion%" +# LIBMONGOC_VERSION: "1.25.0" +# - func: "upload build" +# - name: "build-php-%phpVersion%-libmongoc-next-stable" +# tags: ["build-libmongoc", "php%phpVersion%"] +# commands: +# - func: "compile driver" +# vars: +# PHP_VERSION: "%phpVersion%" +# LIBMONGOC_VERSION: "r1.25" +# - func: "upload build" + - name: "build-php-%phpVersion%-libmongoc-latest" + tags: ["build-libmongoc", "php%phpVersion%"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "%phpVersion%" + LIBMONGOC_VERSION: "master" + - func: "upload build" diff --git a/.evergreen/config/build/_template-build-php.yml b/.evergreen/config/build/_template-build-php.yml new file mode 100644 index 000000000..3cc65caeb --- /dev/null +++ b/.evergreen/config/build/_template-build-php.yml @@ -0,0 +1,8 @@ +tasks: + - name: "build-php-%phpVersion%" + tags: ["build", "php%phpVersion%"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "%phpVersion%" + - func: "upload build" diff --git a/.evergreen/config/build-tasks.yml b/.evergreen/config/build/build-libmongoc-8.2.yml similarity index 51% rename from .evergreen/config/build-tasks.yml rename to .evergreen/config/build/build-libmongoc-8.2.yml index 3eb63471a..0b835836f 100644 --- a/.evergreen/config/build-tasks.yml +++ b/.evergreen/config/build/build-libmongoc-8.2.yml @@ -1,35 +1,5 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - # Standard builds for all PHP versions - - name: "build-php-8.2" - tags: ["build", "php8.2"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "8.2" - - func: "upload build" - - name: "build-php-8.1" - tags: ["build", "php8.1"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "8.1" - - func: "upload build" - - name: "build-php-8.0" - tags: ["build", "php8.0"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "8.0" - - func: "upload build" - - name: "build-php-7.4" - tags: ["build", "php7.4"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "7.4" - - func: "upload build" - - # Special builds with different libmongoc versions # TODO: Enable the following two builds once libmongoc 1.25.0 is released # - name: "build-php-8.2-libmongoc-lowest-supported" # tags: ["build-libmongoc", "php8.2"] diff --git a/.evergreen/config/build/build-php-7.4.yml b/.evergreen/config/build/build-php-7.4.yml new file mode 100644 index 000000000..8e526e5dd --- /dev/null +++ b/.evergreen/config/build/build-php-7.4.yml @@ -0,0 +1,9 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "build-php-7.4" + tags: ["build", "php7.4"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "7.4" + - func: "upload build" diff --git a/.evergreen/config/build/build-php-8.0.yml b/.evergreen/config/build/build-php-8.0.yml new file mode 100644 index 000000000..f848af8cf --- /dev/null +++ b/.evergreen/config/build/build-php-8.0.yml @@ -0,0 +1,9 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "build-php-8.0" + tags: ["build", "php8.0"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.0" + - func: "upload build" diff --git a/.evergreen/config/build/build-php-8.1.yml b/.evergreen/config/build/build-php-8.1.yml new file mode 100644 index 000000000..fd89539ad --- /dev/null +++ b/.evergreen/config/build/build-php-8.1.yml @@ -0,0 +1,9 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "build-php-8.1" + tags: ["build", "php8.1"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.1" + - func: "upload build" diff --git a/.evergreen/config/build/build-php-8.2.yml b/.evergreen/config/build/build-php-8.2.yml new file mode 100644 index 000000000..61d899b7e --- /dev/null +++ b/.evergreen/config/build/build-php-8.2.yml @@ -0,0 +1,9 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "build-php-8.2" + tags: ["build", "php8.2"] + commands: + - func: "compile driver" + vars: + PHP_VERSION: "8.2" + - func: "upload build" diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php new file mode 100644 index 000000000..6bddd4fad --- /dev/null +++ b/.evergreen/config/generate-config.php @@ -0,0 +1,75 @@ +#!/bin/env php + $version]; + + file_put_contents(__DIR__ . $filename, $header . "\n" . strtr($template, $replacements)); + } + + return $files; +} + diff --git a/.evergreen/config/test/_template-load-balanced.yml b/.evergreen/config/test/_template-load-balanced.yml new file mode 100644 index 000000000..7e5fe28b3 --- /dev/null +++ b/.evergreen/config/test/_template-load-balanced.yml @@ -0,0 +1,15 @@ +tasks: + - name: "test-mongodb-%mongodbVersion%-loadbalanced" + tags: ["sharded", "local", "%mongodbVersion%", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "%mongodbVersion%" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" diff --git a/.evergreen/config/test/_template-local.yml b/.evergreen/config/test/_template-local.yml new file mode 100644 index 000000000..649fafce9 --- /dev/null +++ b/.evergreen/config/test/_template-local.yml @@ -0,0 +1,56 @@ +tasks: + - name: "test-mongodb-%mongodbVersion%-standalone-noauth-nossl" + tags: ["standalone", "local", "%mongodbVersion%"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "%mongodbVersion%" + - func: "run tests" + - name: "test-mongodb-%mongodbVersion%-standalone-auth" + tags: ["standalone", "local", "%mongodbVersion%", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "%mongodbVersion%" + - func: "run tests" + - name: "test-mongodb-%mongodbVersion%-standalone-ssl" + tags: ["standalone", "local", "%mongodbVersion%", "ssl"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "%mongodbVersion%" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-%mongodbVersion%-replicaset-noauth-nossl" + tags: ["replicaset", "local", "%mongodbVersion%"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "%mongodbVersion%" + - func: "run tests" + - name: "test-mongodb-%mongodbVersion%-replicaset-auth" + tags: ["replicaset", "local", "%mongodbVersion%", "auth"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "%mongodbVersion%" + - func: "run tests" + + - name: "test-mongodb-%mongodbVersion%-sharded-noauth-nossl" + tags: ["sharded", "local", "%mongodbVersion%"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "%mongodbVersion%" + - func: "run tests" diff --git a/.evergreen/config/test/_template-ocsp.yml b/.evergreen/config/test/_template-ocsp.yml new file mode 100644 index 000000000..dfbbc0aac --- /dev/null +++ b/.evergreen/config/test/_template-ocsp.yml @@ -0,0 +1,389 @@ +tasks: + - name: "ocsp-test_1-rsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-%mongodbVersion%" + tags: ["ocsp", "%mongodbVersion%"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "%mongodbVersion%" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" diff --git a/.evergreen/config/test/_template-require-api-version.yml b/.evergreen/config/test/_template-require-api-version.yml new file mode 100644 index 000000000..cf658833b --- /dev/null +++ b/.evergreen/config/test/_template-require-api-version.yml @@ -0,0 +1,13 @@ +tasks: + - name: "test-requireApiVersion-%mongodbVersion%" + tags: [ "standalone", "local", "%mongodbVersion%", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "%mongodbVersion%" + - func: "run tests" + vars: + API_VERSION: "1" diff --git a/.evergreen/config/test/_template-skip-crypt-shared.yml b/.evergreen/config/test/_template-skip-crypt-shared.yml new file mode 100644 index 000000000..bc2cdff4a --- /dev/null +++ b/.evergreen/config/test/_template-skip-crypt-shared.yml @@ -0,0 +1,11 @@ +tasks: + - name: "test-skip_crypt_shared-%mongodbVersion%" + tags: [ "replicaset", "local", "%mongodbVersion%", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "%mongodbVersion%" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" diff --git a/.evergreen/config/test/load-balanced-5.0.yml b/.evergreen/config/test/load-balanced-5.0.yml new file mode 100644 index 000000000..b632cf4d8 --- /dev/null +++ b/.evergreen/config/test/load-balanced-5.0.yml @@ -0,0 +1,16 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-mongodb-5.0-loadbalanced" + tags: ["sharded", "local", "5.0", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "5.0" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" diff --git a/.evergreen/config/test/load-balanced-6.0.yml b/.evergreen/config/test/load-balanced-6.0.yml new file mode 100644 index 000000000..6c4aca8b0 --- /dev/null +++ b/.evergreen/config/test/load-balanced-6.0.yml @@ -0,0 +1,16 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-mongodb-6.0-loadbalanced" + tags: ["sharded", "local", "6.0", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "6.0" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" diff --git a/.evergreen/config/test/load-balanced-7.0.yml b/.evergreen/config/test/load-balanced-7.0.yml new file mode 100644 index 000000000..0e0faf363 --- /dev/null +++ b/.evergreen/config/test/load-balanced-7.0.yml @@ -0,0 +1,16 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-mongodb-7.0-loadbalanced" + tags: ["sharded", "local", "7.0", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "7.0" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" diff --git a/.evergreen/config/test/load-balanced-latest.yml b/.evergreen/config/test/load-balanced-latest.yml new file mode 100644 index 000000000..b906338f3 --- /dev/null +++ b/.evergreen/config/test/load-balanced-latest.yml @@ -0,0 +1,16 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-mongodb-latest-loadbalanced" + tags: ["sharded", "local", "latest", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "latest" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" diff --git a/.evergreen/config/test/load-balanced-rapid.yml b/.evergreen/config/test/load-balanced-rapid.yml new file mode 100644 index 000000000..b9c45d5fa --- /dev/null +++ b/.evergreen/config/test/load-balanced-rapid.yml @@ -0,0 +1,16 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-mongodb-rapid-loadbalanced" + tags: ["sharded", "local", "rapid", "loadbalanced"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "rapid" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" diff --git a/.evergreen/config/test/load-balanced.yml b/.evergreen/config/test/load-balanced.yml deleted file mode 100644 index 843f0256b..000000000 --- a/.evergreen/config/test/load-balanced.yml +++ /dev/null @@ -1,77 +0,0 @@ -tasks: - - name: "test-mongodb-latest-loadbalanced" - tags: ["sharded", "local", "latest", "loadbalanced"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "latest" - LOAD_BALANCER: "true" - SSL: "yes" - - func: "start load balancer" - - func: "run tests" - vars: - MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" - SSL: "yes" - - - name: "test-mongodb-rapid-loadbalanced" - tags: ["sharded", "local", "rapid", "loadbalanced"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "rapid" - LOAD_BALANCER: "true" - SSL: "yes" - - func: "start load balancer" - - func: "run tests" - vars: - MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" - SSL: "yes" - # Note: "stop load balancer" will be called from "post" - - - name: "test-mongodb-7.0-loadbalanced" - tags: ["sharded", "local", "7.0", "loadbalanced"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "7.0" - LOAD_BALANCER: "true" - SSL: "yes" - - func: "start load balancer" - - func: "run tests" - vars: - MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" - SSL: "yes" - - - name: "test-mongodb-6.0-loadbalanced" - tags: ["sharded", "local", "6.0", "loadbalanced"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "6.0" - LOAD_BALANCER: "true" - SSL: "yes" - - func: "start load balancer" - - func: "run tests" - vars: - MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" - SSL: "yes" - - - name: "test-mongodb-5.0-loadbalanced" - tags: ["sharded", "local", "5.0", "loadbalanced"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "5.0" - LOAD_BALANCER: "true" - SSL: "yes" - - func: "start load balancer" - - func: "run tests" - vars: - # Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI - MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" - SSL: "yes" diff --git a/.evergreen/config/test/loadbalanced-5.0.yml b/.evergreen/config/test/loadbalanced-5.0.yml new file mode 100644 index 000000000..e69de29bb diff --git a/.evergreen/config/test/loadbalanced-6.0.yml b/.evergreen/config/test/loadbalanced-6.0.yml new file mode 100644 index 000000000..e69de29bb diff --git a/.evergreen/config/test/loadbalanced-7.0.yml b/.evergreen/config/test/loadbalanced-7.0.yml new file mode 100644 index 000000000..e69de29bb diff --git a/.evergreen/config/test/loadbalanced-latest.yml b/.evergreen/config/test/loadbalanced-latest.yml new file mode 100644 index 000000000..e69de29bb diff --git a/.evergreen/config/test/loadbalanced-rapid.yml b/.evergreen/config/test/loadbalanced-rapid.yml new file mode 100644 index 000000000..e69de29bb diff --git a/.evergreen/config/test/local-3.6.yml b/.evergreen/config/test/local-3.6.yml index a2f5d82e4..32d9c7b55 100644 --- a/.evergreen/config/test/local-3.6.yml +++ b/.evergreen/config/test/local-3.6.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-3.6-standalone-noauth-nossl" tags: ["standalone", "local", "3.6"] diff --git a/.evergreen/config/test/local-4.0.yml b/.evergreen/config/test/local-4.0.yml index b823874c7..7b9a155ef 100644 --- a/.evergreen/config/test/local-4.0.yml +++ b/.evergreen/config/test/local-4.0.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-4.0-standalone-noauth-nossl" tags: ["standalone", "local", "4.0"] diff --git a/.evergreen/config/test/local-4.2.yml b/.evergreen/config/test/local-4.2.yml index 1b1943968..f65f9ab73 100644 --- a/.evergreen/config/test/local-4.2.yml +++ b/.evergreen/config/test/local-4.2.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-4.2-standalone-noauth-nossl" tags: ["standalone", "local", "4.2"] diff --git a/.evergreen/config/test/local-4.4.yml b/.evergreen/config/test/local-4.4.yml index 7d6c87765..5a0cca7b2 100644 --- a/.evergreen/config/test/local-4.4.yml +++ b/.evergreen/config/test/local-4.4.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-4.4-standalone-noauth-nossl" tags: ["standalone", "local", "4.4"] diff --git a/.evergreen/config/test/local-5.0.yml b/.evergreen/config/test/local-5.0.yml index a409c1bb2..2ebbc27ea 100644 --- a/.evergreen/config/test/local-5.0.yml +++ b/.evergreen/config/test/local-5.0.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-5.0-standalone-noauth-nossl" tags: ["standalone", "local", "5.0"] diff --git a/.evergreen/config/test/local-6.0.yml b/.evergreen/config/test/local-6.0.yml index 09abce69b..70f9f5c95 100644 --- a/.evergreen/config/test/local-6.0.yml +++ b/.evergreen/config/test/local-6.0.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-6.0-standalone-noauth-nossl" tags: ["standalone", "local", "6.0"] diff --git a/.evergreen/config/test/local-7.0.yml b/.evergreen/config/test/local-7.0.yml index 8800dfef7..77e47ab9f 100644 --- a/.evergreen/config/test/local-7.0.yml +++ b/.evergreen/config/test/local-7.0.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-7.0-standalone-noauth-nossl" tags: ["standalone", "local", "7.0"] diff --git a/.evergreen/config/test/local-latest.yml b/.evergreen/config/test/local-latest.yml index 5053c56ac..505d7edd4 100644 --- a/.evergreen/config/test/local-latest.yml +++ b/.evergreen/config/test/local-latest.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-latest-standalone-noauth-nossl" tags: ["standalone", "local", "latest"] diff --git a/.evergreen/config/test/local-rapid.yml b/.evergreen/config/test/local-rapid.yml index 3cb0708d2..15196042a 100644 --- a/.evergreen/config/test/local-rapid.yml +++ b/.evergreen/config/test/local-rapid.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "test-mongodb-rapid-standalone-noauth-nossl" tags: ["standalone", "local", "rapid"] diff --git a/.evergreen/config/test/ocsp-4.4.yml b/.evergreen/config/test/ocsp-4.4.yml index 8242b50ae..9c49fcfb6 100644 --- a/.evergreen/config/test/ocsp-4.4.yml +++ b/.evergreen/config/test/ocsp-4.4.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "ocsp-test_1-rsa-delegate-4.4" tags: ["ocsp", "4.4"] diff --git a/.evergreen/config/test/ocsp-5.0.yml b/.evergreen/config/test/ocsp-5.0.yml index 096b1d125..8bd577780 100644 --- a/.evergreen/config/test/ocsp-5.0.yml +++ b/.evergreen/config/test/ocsp-5.0.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "ocsp-test_1-rsa-delegate-5.0" tags: ["ocsp", "5.0"] diff --git a/.evergreen/config/test/ocsp-6.0.yml b/.evergreen/config/test/ocsp-6.0.yml index 5dce9495e..5498c7774 100644 --- a/.evergreen/config/test/ocsp-6.0.yml +++ b/.evergreen/config/test/ocsp-6.0.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "ocsp-test_1-rsa-delegate-6.0" tags: ["ocsp", "6.0"] diff --git a/.evergreen/config/test/ocsp-7.0.yml b/.evergreen/config/test/ocsp-7.0.yml index a299c84f9..6941222c0 100644 --- a/.evergreen/config/test/ocsp-7.0.yml +++ b/.evergreen/config/test/ocsp-7.0.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "ocsp-test_1-rsa-delegate-7.0" tags: ["ocsp", "7.0"] diff --git a/.evergreen/config/test/ocsp-latest.yml b/.evergreen/config/test/ocsp-latest.yml index 0c516dc93..3a90bd67a 100644 --- a/.evergreen/config/test/ocsp-latest.yml +++ b/.evergreen/config/test/ocsp-latest.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "ocsp-test_1-rsa-delegate-latest" tags: ["ocsp", "latest"] diff --git a/.evergreen/config/test/ocsp-rapid.yml b/.evergreen/config/test/ocsp-rapid.yml index 012ec571c..3eab07504 100644 --- a/.evergreen/config/test/ocsp-rapid.yml +++ b/.evergreen/config/test/ocsp-rapid.yml @@ -1,3 +1,4 @@ +# This file is generated automatically - please edit the corresponding template file! tasks: - name: "ocsp-test_1-rsa-delegate-rapid" tags: ["ocsp", "rapid"] diff --git a/.evergreen/config/test/require-api-version-5.0.yml b/.evergreen/config/test/require-api-version-5.0.yml new file mode 100644 index 000000000..a493a787f --- /dev/null +++ b/.evergreen/config/test/require-api-version-5.0.yml @@ -0,0 +1,14 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-requireApiVersion-5.0" + tags: [ "standalone", "local", "5.0", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "5.0" + - func: "run tests" + vars: + API_VERSION: "1" diff --git a/.evergreen/config/test/require-api-version-6.0.yml b/.evergreen/config/test/require-api-version-6.0.yml new file mode 100644 index 000000000..76a7d43ce --- /dev/null +++ b/.evergreen/config/test/require-api-version-6.0.yml @@ -0,0 +1,14 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-requireApiVersion-6.0" + tags: [ "standalone", "local", "6.0", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "6.0" + - func: "run tests" + vars: + API_VERSION: "1" diff --git a/.evergreen/config/test/require-api-version-7.0.yml b/.evergreen/config/test/require-api-version-7.0.yml new file mode 100644 index 000000000..62800cff7 --- /dev/null +++ b/.evergreen/config/test/require-api-version-7.0.yml @@ -0,0 +1,14 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-requireApiVersion-7.0" + tags: [ "standalone", "local", "7.0", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "7.0" + - func: "run tests" + vars: + API_VERSION: "1" diff --git a/.evergreen/config/test/require-api-version-latest.yml b/.evergreen/config/test/require-api-version-latest.yml new file mode 100644 index 000000000..6d54258e5 --- /dev/null +++ b/.evergreen/config/test/require-api-version-latest.yml @@ -0,0 +1,14 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-requireApiVersion-latest" + tags: [ "standalone", "local", "latest", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "latest" + - func: "run tests" + vars: + API_VERSION: "1" diff --git a/.evergreen/config/test/require-api-version-rapid.yml b/.evergreen/config/test/require-api-version-rapid.yml new file mode 100644 index 000000000..87fc7bedd --- /dev/null +++ b/.evergreen/config/test/require-api-version-rapid.yml @@ -0,0 +1,14 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-requireApiVersion-rapid" + tags: [ "standalone", "local", "rapid", "versioned_api" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "rapid" + - func: "run tests" + vars: + API_VERSION: "1" diff --git a/.evergreen/config/test/require-api-version.yml b/.evergreen/config/test/require-api-version.yml deleted file mode 100644 index 8a824d1a5..000000000 --- a/.evergreen/config/test/require-api-version.yml +++ /dev/null @@ -1,65 +0,0 @@ -tasks: - - name: "test-requireApiVersion-latest" - tags: [ "standalone", "local", "latest", "versioned_api" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - REQUIRE_API_VERSION: "yes" - MONGODB_VERSION: "latest" - - func: "run tests" - vars: - API_VERSION: "1" - - - name: "test-requireApiVersion-rapid" - tags: [ "standalone", "local", "rapid", "versioned_api" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - REQUIRE_API_VERSION: "yes" - MONGODB_VERSION: "rapid" - - func: "run tests" - vars: - API_VERSION: "1" - - - name: "test-requireApiVersion-7.0" - tags: [ "standalone", "local", "7.0", "versioned_api" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - REQUIRE_API_VERSION: "yes" - MONGODB_VERSION: "7.0" - - func: "run tests" - vars: - API_VERSION: "1" - - - name: "test-requireApiVersion-6.0" - tags: [ "standalone", "local", "6.0", "versioned_api" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - REQUIRE_API_VERSION: "yes" - MONGODB_VERSION: "6.0" - - func: "run tests" - vars: - API_VERSION: "1" - - - name: "test-requireApiVersion-5.0" - tags: [ "standalone", "local", "5.0", "versioned_api" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - REQUIRE_API_VERSION: "yes" - MONGODB_VERSION: "5.0" - - func: "run tests" - vars: - API_VERSION: "1" diff --git a/.evergreen/config/test/skip-crypt-shared-6.0.yml b/.evergreen/config/test/skip-crypt-shared-6.0.yml new file mode 100644 index 000000000..e49538c34 --- /dev/null +++ b/.evergreen/config/test/skip-crypt-shared-6.0.yml @@ -0,0 +1,12 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-skip_crypt_shared-6.0" + tags: [ "replicaset", "local", "6.0", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "6.0" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" diff --git a/.evergreen/config/test/skip-crypt-shared-7.0.yml b/.evergreen/config/test/skip-crypt-shared-7.0.yml new file mode 100644 index 000000000..3330ecc50 --- /dev/null +++ b/.evergreen/config/test/skip-crypt-shared-7.0.yml @@ -0,0 +1,12 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-skip_crypt_shared-7.0" + tags: [ "replicaset", "local", "7.0", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "7.0" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" diff --git a/.evergreen/config/test/skip-crypt-shared-latest.yml b/.evergreen/config/test/skip-crypt-shared-latest.yml new file mode 100644 index 000000000..58209ba1c --- /dev/null +++ b/.evergreen/config/test/skip-crypt-shared-latest.yml @@ -0,0 +1,12 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-skip_crypt_shared-latest" + tags: [ "replicaset", "local", "latest", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "latest" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" diff --git a/.evergreen/config/test/skip-crypt-shared-rapid.yml b/.evergreen/config/test/skip-crypt-shared-rapid.yml new file mode 100644 index 000000000..3e2487b50 --- /dev/null +++ b/.evergreen/config/test/skip-crypt-shared-rapid.yml @@ -0,0 +1,12 @@ +# This file is generated automatically - please edit the corresponding template file! +tasks: + - name: "test-skip_crypt_shared-rapid" + tags: [ "replicaset", "local", "rapid", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "rapid" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" diff --git a/.evergreen/config/test/skip-crypt-shared.yml b/.evergreen/config/test/skip-crypt-shared.yml deleted file mode 100644 index c679e5008..000000000 --- a/.evergreen/config/test/skip-crypt-shared.yml +++ /dev/null @@ -1,44 +0,0 @@ -tasks: - - name: "test-skip_crypt_shared-latest" - tags: [ "replicaset", "local", "latest", "skip_crypt_shared" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "latest" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - - name: "test-skip_crypt_shared-rapid" - tags: [ "replicaset", "local", "rapid", "skip_crypt_shared" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "rapid" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - - name: "test-skip_crypt_shared-7.0" - tags: [ "replicaset", "local", "7.0", "skip_crypt_shared" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "7.0" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" - - - name: "test-skip_crypt_shared-6.0" - tags: [ "replicaset", "local", "6.0", "skip_crypt_shared" ] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "6.0" - - func: "run tests" - vars: - SKIP_CRYPT_SHARED: "yes" From eaee3d852fa54236d2335bd271cbd8904e4a6be5 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 26 Sep 2023 09:13:54 +0200 Subject: [PATCH 25/44] Remove obsolete files --- .evergreen/config/test/loadbalanced-5.0.yml | 0 .evergreen/config/test/loadbalanced-6.0.yml | 0 .evergreen/config/test/loadbalanced-7.0.yml | 0 .evergreen/config/test/loadbalanced-latest.yml | 0 .evergreen/config/test/loadbalanced-rapid.yml | 0 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .evergreen/config/test/loadbalanced-5.0.yml delete mode 100644 .evergreen/config/test/loadbalanced-6.0.yml delete mode 100644 .evergreen/config/test/loadbalanced-7.0.yml delete mode 100644 .evergreen/config/test/loadbalanced-latest.yml delete mode 100644 .evergreen/config/test/loadbalanced-rapid.yml diff --git a/.evergreen/config/test/loadbalanced-5.0.yml b/.evergreen/config/test/loadbalanced-5.0.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/.evergreen/config/test/loadbalanced-6.0.yml b/.evergreen/config/test/loadbalanced-6.0.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/.evergreen/config/test/loadbalanced-7.0.yml b/.evergreen/config/test/loadbalanced-7.0.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/.evergreen/config/test/loadbalanced-latest.yml b/.evergreen/config/test/loadbalanced-latest.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/.evergreen/config/test/loadbalanced-rapid.yml b/.evergreen/config/test/loadbalanced-rapid.yml deleted file mode 100644 index e69de29bb..000000000 From 6607c0f167c0325de61e3b238be4d6103f44c886 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 26 Sep 2023 09:30:21 +0200 Subject: [PATCH 26/44] Refactor generation script --- .evergreen/config/generate-config.php | 56 ++++++++++++++++----------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php index 6bddd4fad..b524acf9d 100644 --- a/.evergreen/config/generate-config.php +++ b/.evergreen/config/generate-config.php @@ -1,40 +1,50 @@ #!/bin/env php in_array($version, ['latest', 'rapid']) || version_compare($version, '5.0', '>='), +); +$ocspServerVersions = array_filter( + $supportedMongoDBVersions, + // OCSP supports MongoDB 4.4+ + fn (string $version): bool => in_array($version, ['latest', 'rapid']) || version_compare($version, '4.4', '>='), +); +$requireApiServerVersions = array_filter( + $supportedMongoDBVersions, + // requireApiVersion supports MongoDB 5.0+ + fn (string $version): bool => in_array($version, ['latest', 'rapid']) || version_compare($version, '5.0', '>='), +); +$skipCryptSharedServerVersions = array_filter( + $supportedMongoDBVersions, + // crypt_shared is available starting with MongoDB 6.0 + fn (string $version): bool => in_array($version, ['latest', 'rapid']) || version_compare($version, '6.0', '>='), +); $allFiles = []; -$allFiles[] = generateConfigs('build', 'phpVersion', '_template-build-php.yml', 'build-php-%s', $buildPhpVersions); +// Build tasks +$allFiles[] = generateConfigs('build', 'phpVersion', '_template-build-php.yml', 'build-php-%s', $supportedPhpVersions); $allFiles[] = generateConfigs('build', 'phpVersion', '_template-build-libmongoc.yml', 'build-libmongoc-%s', $libmongocBuildPhpVersions); +// Test tasks $allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-local.yml', 'local-%s', $localServerVersions); $allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions); $allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-ocsp.yml', 'ocsp-%s', $ocspServerVersions); From 37c944cf65c5de0ec58b88971feeef0dd8e7c45b Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 26 Sep 2023 09:32:06 +0200 Subject: [PATCH 27/44] Remove version identifier from libmongoc task names --- .evergreen/config/build-task-groups.yml | 5 ++--- .evergreen/config/build-variants.yml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.evergreen/config/build-task-groups.yml b/.evergreen/config/build-task-groups.yml index 234b4604b..4e5214bdd 100644 --- a/.evergreen/config/build-task-groups.yml +++ b/.evergreen/config/build-task-groups.yml @@ -34,8 +34,7 @@ task_groups: tasks: - ".build !.php7.4 !.php8.0" - # Builds PHP 8.2 with different versions of libmongoc - - name: "build-php-8.2-libmongoc" + - name: "build-php-libmongoc" # Keep this in sync with the actual number of libmongoc builds (typically 3) max_hosts: 1 setup_task: *build_setup @@ -43,4 +42,4 @@ task_groups: setup_task_timeout_secs: 1800 teardown_task: *build_teardown tasks: - - ".build-libmongoc .php8.2" + - ".build-libmongoc" diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml index 25c7dbe9a..47354dce3 100644 --- a/.evergreen/config/build-variants.yml +++ b/.evergreen/config/build-variants.yml @@ -8,7 +8,7 @@ buildvariants: run_on: debian11-small tasks: - name: "build-all-php" - - name: "build-php-8.2-libmongoc" + - name: "build-php-libmongoc" - name: build-debian10 display_name: "Build: Debian 10" run_on: debian10-small From 5b8d711b8e1c132985f0b6f4fff8b0723ec7a311 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 26 Sep 2023 09:32:26 +0200 Subject: [PATCH 28/44] Add variant tags to facilitate patch filters --- .evergreen/config/build-variants.yml | 13 +++++++++++++ .evergreen/config/test-variants.yml | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml index 47354dce3..1742705a2 100644 --- a/.evergreen/config/build-variants.yml +++ b/.evergreen/config/build-variants.yml @@ -5,17 +5,20 @@ buildvariants: # Debian - name: build-debian11 display_name: "Build: Debian 11" + tags: ["build", "debian", "x64"] run_on: debian11-small tasks: - name: "build-all-php" - name: "build-php-libmongoc" - name: build-debian10 display_name: "Build: Debian 10" + tags: ["build", "debian", "x64"] run_on: debian10-small tasks: - name: "build-all-php" - name: build-debian92 display_name: "Build: Debian 9.2" + tags: ["build", "debian", "x64"] run_on: debian92-small tasks: - name: "build-all-php" @@ -23,31 +26,37 @@ buildvariants: # RHEL - name: build-rhel90 display_name: "Build: RHEL 9.0" + tags: ["build", "rhel", "x64"] run_on: rhel90-small tasks: - name: "build-php-openssl3" - name: build-rhel83-zseries display_name: "Build: RHEL 8.3 Zseries" + tags: ["build", "rhel", "zseries"] run_on: rhel83-zseries-small tasks: - name: "build-all-php" - name: build-rhel82-arm64 display_name: "Build: RHEL 8.2 ARM64" + tags: ["build", "rhel", "arm64"] run_on: rhel82-arm64 tasks: - name: "build-all-php" - name: build-rhel81-power8 display_name: "Build: RHEL 8.1 Power8" + tags: ["build", "rhel", "power8"] run_on: rhel81-power8-large tasks: - name: "build-all-php" - name: build-rhel80 display_name: "Build: RHEL 8.0" + tags: ["build", "rhel", "x64"] run_on: rhel80-small tasks: - name: "build-all-php" - name: build-rhel76 display_name: "Build: RHEL 7.6" + tags: ["build", "rhel", "x64"] run_on: rhel76-small tasks: - name: "build-all-php" @@ -55,21 +64,25 @@ buildvariants: # Ubuntu LTS - name: build-ubuntu2204 display_name: "Build: Ubuntu 22.04 x64" + tags: ["build", "ubuntu", "x64"] run_on: ubuntu2204-small tasks: - name: "build-php-openssl3" - name: build-ubuntu2204-arm64 display_name: "Build: Ubuntu 22.04 ARM64" + tags: ["build", "ubuntu", "arm64"] run_on: ubuntu2204-arm64-small tasks: - name: "build-php-openssl3" - name: build-ubuntu2004 display_name: "Build: Ubuntu 20.04 x64" + tags: ["build", "ubuntu", "x64"] run_on: ubuntu2004-small tasks: - name: "build-all-php" - name: build-ubuntu2004-arm64 display_name: "Build: Ubuntu 20.04 ARM64" + tags: ["build", "ubuntu", "arm64"] run_on: ubuntu2004-arm64-small tasks: - name: "build-all-php" diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml index 84d5adedf..e0668db50 100644 --- a/.evergreen/config/test-variants.yml +++ b/.evergreen/config/test-variants.yml @@ -4,6 +4,7 @@ buildvariants: # PHP 8.2: test all topologies on all versions of MongoDB - name: test-debian11-php82-local + tags: ["test", "debian", "x64"] display_name: "Test: Debian 11, PHP 8.2" run_on: debian11-small expansions: @@ -35,6 +36,7 @@ buildvariants: execution_tasks: - ".ocsp .5.0" - name: test-debian92-php82-local + tags: ["test", "debian", "x64"] display_name: "Test: Debian 9.2, PHP 8.2" run_on: debian92-small expansions: @@ -56,6 +58,7 @@ buildvariants: # Test remaining PHP versions with replica sets on Debian 11 with MongoDB 7.0 - name: test-debian11-php81-local + tags: ["test", "debian", "x64"] display_name: "Test: Debian 11, PHP 8.1" run_on: debian11-small expansions: @@ -67,6 +70,7 @@ buildvariants: tasks: - ".replicaset .local .7.0 .auth" - name: test-debian11-php80-local + tags: ["test", "debian", "x64"] display_name: "Test: Debian 11, PHP 8.0" run_on: debian11-small expansions: @@ -78,6 +82,7 @@ buildvariants: tasks: - ".replicaset .local .7.0 .auth" - name: test-debian11-php74-local + tags: ["test", "debian", "x64"] display_name: "Test: Debian 11, PHP 7.4" run_on: debian11-small expansions: @@ -93,6 +98,7 @@ buildvariants: # TODO: Enable the following two builds once libmongoc 1.25.0 is released # - name: test-debian11-php82-local-libmongoc-lowest-supported # display_name: "Test: Debian 11, PHP 8.2, libmongoc lowest" +# tags: ["test", "libmongoc", "debian", "x64"] # run_on: debian11-small # expansions: # FETCH_BUILD_VARIANT: "build-debian11" @@ -104,6 +110,7 @@ buildvariants: # - ".replicaset .local .7.0 .auth" # - name: test-debian11-php82-local-libmongoc-next-stable # display_name: "Test: Debian 11, PHP 8.2, libmongoc next stable" +# tags: ["test", "libmongoc", "debian", "x64"] # run_on: debian11-small # expansions: # FETCH_BUILD_VARIANT: "build-debian11" @@ -114,6 +121,7 @@ buildvariants: # tasks: # - ".replicaset .local .7.0 .auth" - name: test-debian11-php82-local-libmongoc-latest + tags: ["test", "libmongoc", "debian", "x64"] display_name: "Test: Debian 11, PHP 8.2, libmongoc latest" run_on: debian11-small expansions: From 1a92176a4a521474c3fcc853a6eb92e222c6b6cd Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 26 Sep 2023 09:40:19 +0200 Subject: [PATCH 29/44] Define pull request aliases in evergreen config --- .evergreen/config.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 0efe6cb3e..d2975d947 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -30,6 +30,20 @@ post: &test_teardown - func: "upload working dir" - func: "cleanup" +# Define aliases for patch builds and PR builds. These only apply if no aliases are defined in project settings +github_pr_aliases: + # Run all build tasks, except on Power8 and zSeries due to low number of build hardware + - variant_tags: + - "build !power8 !zseries" + task_tags: + - "*" + # Run tests on debian, only testing local replicasets with authentication enabled + - variant_tags: + - "test debian !libmongoc" + task_tags: + - "replicaset auth local" + +# Include files that contain various tasks, task groups, and build variant definitions include: - filename: .evergreen/config/functions.yml From d52d13dd7c0be28815315a10a482e74e0e8e9a3d Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 26 Sep 2023 11:13:09 +0200 Subject: [PATCH 30/44] Add architecture documentation --- .evergreen/architecture.md | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .evergreen/architecture.md diff --git a/.evergreen/architecture.md b/.evergreen/architecture.md new file mode 100644 index 000000000..34fc79f0a --- /dev/null +++ b/.evergreen/architecture.md @@ -0,0 +1,45 @@ +# Evergreen Build System Architecture + +To avoid unnecessary tasks from being started, this project uses two separate build steps. The first step compiles the +PHP extension on the requested operating system and PHP version, caching the result. The second step runs tests on +various platforms, re-using the cached build artifacts from the first step. + +## Build Step 1: Compile PHP Extension + +The extension is built for all supported PHP versions on all supported platforms. This build step is run for every +commit pushed to the development branch, as well as for stable branches and pull requests to these branches. The build +step includes a smoke test that attempts to load the compiled extension to catch errors that occur during extension +initialisation. If a build step fails, test tasks are skipped for that platform and PHP version. + +### Build tasks + +Build tasks are generated automatically and included in the main config file. The `build-variants.yml` file contains +the list of supported platforms that the extension is built for. `build-task-groups.yml` defines the task groups that +contain the build tasks. Note there is a separate task that skips PHP 7.4 and 8.0, as these versions do not support +OpenSSL 3 (currently used on RHEL 9+ and Ubuntu 22.04+). + +## Build Step 2: Run Tests + +Tests are not offered for all platforms, and only select tasks are run for commits and pull requests. First, all +combinations of MongoDB topologies (standalone, replica set, sharded cluster, and load balanced) are run for all +supported MongoDB versions. Then, all PHP versions are tested against the latest stable version of MongoDB. Finally, +a last build variant runs tests on PHP 8.2 against the latest stable version of MongoDB using different libmongoc +versions. + +## Modifying generated tasks + +Most build and test tasks are generated using the `generate-config.php` script and referenced using tags. To modify the +configuration, change the appropriate `_template-.yml` file in the `build` or `test` directory, then run the +generator script to update the files. The generator script will output a list of include statements that can be copied +to the main `config.yml` file to include all generated tasks. + +## Adding new tasks + +Adding new tasks for a new MongoDB version or PHP version is done by modifying `generate-config.php` and including the +version in the corresponding arrays, then regenerating configuration. Note that obsolete files will not be deleted +automatically, but they won't be in the list of include files printed by the generator script. + +## Patch Aliases + +Aliases are configured in the main evergreen configuration file. `github_pr_aliases` defines aliases for tasks to be run +for every pull request. From 1033d8646e74b49dd0665c9028fecd01d74f81c1 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 27 Sep 2023 09:38:44 +0200 Subject: [PATCH 31/44] Use regular expression for PR aliases --- .evergreen/config.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index d2975d947..ec4c1059d 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -33,15 +33,11 @@ post: &test_teardown # Define aliases for patch builds and PR builds. These only apply if no aliases are defined in project settings github_pr_aliases: # Run all build tasks, except on Power8 and zSeries due to low number of build hardware - - variant_tags: - - "build !power8 !zseries" - task_tags: - - "*" + - variant: "^build-[^-]+($|-arm64)" + task: ".*" # Run tests on debian, only testing local replicasets with authentication enabled - - variant_tags: - - "test debian !libmongoc" - task_tags: - - "replicaset auth local" + - variant: "test-.*" + task: "test-mongodb-.*-replicaset-auth" # Include files that contain various tasks, task groups, and build variant definitions include: From 0edd44d0bf984ceb0a2b41d889071a32ed6d8524 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 27 Sep 2023 09:48:52 +0200 Subject: [PATCH 32/44] Mark generated files as such --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..ad604c940 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +.evergreen/config/build/*.yml linguist-generated=true +.evergreen/config/build/_template*.yml linguist-generated=false + +.evergreen/config/test/*.yml linguist-generated=true +.evergreen/config/test/_template*.yml linguist-generated=false From 7a87c85299eb11f282c28dc3f2c2f1c5dca5b542 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 4 Oct 2023 12:11:06 +0200 Subject: [PATCH 33/44] Remove unnecessary functions - Artifactory uploads are not used, so we can save on disk space - Evergreen isn't used to test Windows builds, so we don't need to make Windows fixes - Files should already be executable --- .evergreen/config.yml | 4 -- .evergreen/config/build-task-groups.yml | 3 - .evergreen/config/functions.yml | 88 ------------------------- 3 files changed, 95 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ec4c1059d..23edf62d9 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -16,18 +16,14 @@ exec_timeout_secs: 1800 pre: &test_setup - func: "fetch source" - func: "prepare resources" - - func: "windows fix" - func: "fix absolute paths" - func: "init test-results" - - func: "make files executable" - func: "install dependencies" - func: "fetch build" post: &test_teardown - - func: "upload mo artifacts" - func: "upload test results" - func: "stop mongo-orchestration" - func: "stop load balancer" - - func: "upload working dir" - func: "cleanup" # Define aliases for patch builds and PR builds. These only apply if no aliases are defined in project settings diff --git a/.evergreen/config/build-task-groups.yml b/.evergreen/config/build-task-groups.yml index 4e5214bdd..0d2c076cc 100644 --- a/.evergreen/config/build-task-groups.yml +++ b/.evergreen/config/build-task-groups.yml @@ -2,12 +2,9 @@ variables: build_setup: &build_setup - func: "fetch source" - func: "prepare resources" - - func: "windows fix" - func: "fix absolute paths" - - func: "make files executable" - func: "install dependencies" build_teardown: &build_teardown - - func: "upload working dir" - func: "cleanup" task_groups: diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml index 4fd3ecfb3..1d23664eb 100644 --- a/.evergreen/config/functions.yml +++ b/.evergreen/config/functions.yml @@ -154,75 +154,6 @@ functions: args: - ${PROJECT_DIRECTORY}/.evergreen/compile-unix.sh - "upload mo artifacts": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - find $MONGO_ORCHESTRATION_HOME -name \*.log | xargs tar czf mongodb-logs.tar.gz - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: mongodb-logs.tar.gz - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/x-gzip} - display_name: "mongodb-logs.tar.gz" - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: ${DRIVERS_TOOLS}/.evergreen/orchestration/server.log - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log - bucket: mciuploads - permissions: public-read - content_type: ${content_type|text/plain} - display_name: "orchestration.log" - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - find /tmp/MO -name \*.log | xargs tar czf mongodb-start-logs.tar.gz - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: mongodb-start-logs.tar.gz - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-start-logs.tar.gz - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/x-gzip} - display_name: "mongodb-start-logs.tar.gz" - - "upload working dir": - - command: archive.targz_pack - params: - target: "working-dir.tar.gz" - source_dir: ${PROJECT_DIRECTORY}/ - include: - - "./**" - - command: archive.targz_pack - params: - target: "drivers-dir.tar.gz" - source_dir: ${DRIVERS_TOOLS} - include: - - "./**" - exclude_files: - # Windows cannot read the mongod *.lock files because they are locked. - - "*.lock" - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: drivers-dir.tar.gz - remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/artifacts/${task_id}-${execution}-drivers-dir.tar.gz - bucket: mciuploads - permissions: public-read - content_type: ${content_type|application/x-gzip} - display_name: "drivers-dir.tar.gz" - "upload test results": - command: attach.xunit_results params: @@ -294,25 +225,6 @@ functions: perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename done - "windows fix": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do - cat $i | tr -d '\r' > $i.new - mv $i.new $i - done - - "make files executable": - - command: shell.exec - params: - script: | - ${PREPARE_SHELL} - for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY}/.evergreen -name \*.sh); do - chmod +x $i - done - "init test-results": - command: shell.exec params: From d19f8ae1d442d704c7424f67b1780dd3e7135f3d Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 6 Oct 2023 12:33:47 +0200 Subject: [PATCH 34/44] Update CI documentation --- .evergreen/architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/architecture.md b/.evergreen/architecture.md index 34fc79f0a..9d37b8315 100644 --- a/.evergreen/architecture.md +++ b/.evergreen/architecture.md @@ -41,5 +41,5 @@ automatically, but they won't be in the list of include files printed by the gen ## Patch Aliases -Aliases are configured in the main evergreen configuration file. `github_pr_aliases` defines aliases for tasks to be run +Aliases are configured in the main Evergreen configuration file. `github_pr_aliases` defines aliases for tasks to be run for every pull request. From 305e50d6ec97a6529b6941d50355f1555d5efb63 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 9 Oct 2023 10:04:03 +0200 Subject: [PATCH 35/44] Remove unused YAML tags --- .evergreen/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 23edf62d9..1164b52e9 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -13,14 +13,14 @@ exec_timeout_secs: 1800 # These pre and post rules apply to all tasks not part of a task group, which should only ever be tests against local # MongoDB instances. All other tasks that require special preparation should be run from within a task group -pre: &test_setup +pre: - func: "fetch source" - func: "prepare resources" - func: "fix absolute paths" - func: "init test-results" - func: "install dependencies" - func: "fetch build" -post: &test_teardown +post: - func: "upload test results" - func: "stop mongo-orchestration" - func: "stop load balancer" From 86d83697b87a8ce837e4811fb8fa4cfdeca67162 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 9 Oct 2023 10:08:39 +0200 Subject: [PATCH 36/44] Document references of libmongoc build tasks --- .evergreen/config/build-task-groups.yml | 2 +- .evergreen/config/build/_template-build-libmongoc.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.evergreen/config/build-task-groups.yml b/.evergreen/config/build-task-groups.yml index 0d2c076cc..d14fe8998 100644 --- a/.evergreen/config/build-task-groups.yml +++ b/.evergreen/config/build-task-groups.yml @@ -32,7 +32,7 @@ task_groups: - ".build !.php7.4 !.php8.0" - name: "build-php-libmongoc" - # Keep this in sync with the actual number of libmongoc builds (typically 3) + # Keep this in sync with the actual number of libmongoc builds (typically 3) defined in _template-build-libmongoc.yml max_hosts: 1 setup_task: *build_setup setup_task_can_fail_task: true diff --git a/.evergreen/config/build/_template-build-libmongoc.yml b/.evergreen/config/build/_template-build-libmongoc.yml index 35aa539b5..cdc206683 100644 --- a/.evergreen/config/build/_template-build-libmongoc.yml +++ b/.evergreen/config/build/_template-build-libmongoc.yml @@ -1,3 +1,9 @@ +# The following tasks are used to build with different libmongoc versions. +# If libmongoc is not set to a stable version, disable the first two builds and only leave the last one enabled. +# When updating libmongoc to a stable release, make sure all builds are enabled. +# These tasks are used in the build task group "build-php-libmongoc" defined in .evergreen/config/build-task-groups.yml, +# where the "max_hosts" setting must be set to the number of enabled tasks. +# Last but not least, make sure the corresponding test variants are enabled in .evergreen/config/test-variants.yml tasks: # TODO: Enable the following two builds once libmongoc 1.25.0 is released # - name: "build-php-%phpVersion%-libmongoc-lowest-supported" From 802b0bea811dc386b3afaeb4840cdc921f41c017 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 9 Oct 2023 10:19:25 +0200 Subject: [PATCH 37/44] Document tags used in tasks --- .evergreen/architecture.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.evergreen/architecture.md b/.evergreen/architecture.md index 9d37b8315..e9391a4b6 100644 --- a/.evergreen/architecture.md +++ b/.evergreen/architecture.md @@ -43,3 +43,22 @@ automatically, but they won't be in the list of include files printed by the gen Aliases are configured in the main Evergreen configuration file. `github_pr_aliases` defines aliases for tasks to be run for every pull request. + +## Task Tags + +Tasks are tagged to allow for a better selection in build variants. The following tags are used for build tasks: +- `build`: All build tasks are tagged with `build`. +- `build-libmongoc`: These build tasks build with different libmongoc versions. +- `php`: These tags allow selection based on PHP version, e.g. `php8.2`. + +Test tasks use the following tags: +- `local`: All tasks that run a local MongoDB cluster for testing. +- ``: These tags allow selection based on MongoDB version, e.g. `6.4`. +- `standalone`, `replicaset`, `sharded`: These tags allow selection based on the MongoDB topology. +- `loadbalanced`: Allows for selecting tests using a load balancer +- `ocsp`: Used for all OCSP tasks +- `versioned_api`: Used for tests that use the stable API +- `skip_crypt_shared`: These tasks skip installing the shared library to test with libmongocrypt +- `nodb`: These tasks do not rely on a local database +- `atlas`: These tasks work on a MongoDB Atlas cluster +- `storage-engines`: Tag used for tasks that test the `inmemory` and `mmapv1` storage engines From 10632e3364785346005de25ee721f25ea1665847 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 9 Oct 2023 10:19:47 +0200 Subject: [PATCH 38/44] Make versions in config generator more readable --- .evergreen/config/generate-config.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php index b524acf9d..0ecffd708 100644 --- a/.evergreen/config/generate-config.php +++ b/.evergreen/config/generate-config.php @@ -2,18 +2,28 @@ Date: Mon, 9 Oct 2023 10:24:19 +0200 Subject: [PATCH 39/44] Split templates and generated configs --- .evergreen/config.yml | 68 +++++++++---------- .evergreen/config/generate-config.php | 24 ++++--- .../build/build-libmongoc-8.2.yml | 8 ++- .../{ => generated}/build/build-php-7.4.yml | 2 +- .../{ => generated}/build/build-php-8.0.yml | 2 +- .../{ => generated}/build/build-php-8.1.yml | 2 +- .../{ => generated}/build/build-php-8.2.yml | 2 +- .../test/load-balanced-5.0.yml | 2 +- .../test/load-balanced-6.0.yml | 2 +- .../test/load-balanced-7.0.yml | 2 +- .../test/load-balanced-latest.yml | 2 +- .../test/load-balanced-rapid.yml | 2 +- .../config/{ => generated}/test/local-3.6.yml | 2 +- .../config/{ => generated}/test/local-4.0.yml | 2 +- .../config/{ => generated}/test/local-4.2.yml | 2 +- .../config/{ => generated}/test/local-4.4.yml | 2 +- .../config/{ => generated}/test/local-5.0.yml | 2 +- .../config/{ => generated}/test/local-6.0.yml | 2 +- .../config/{ => generated}/test/local-7.0.yml | 2 +- .../{ => generated}/test/local-latest.yml | 2 +- .../{ => generated}/test/local-rapid.yml | 2 +- .../config/{ => generated}/test/ocsp-4.4.yml | 2 +- .../config/{ => generated}/test/ocsp-5.0.yml | 2 +- .../config/{ => generated}/test/ocsp-6.0.yml | 2 +- .../config/{ => generated}/test/ocsp-7.0.yml | 2 +- .../{ => generated}/test/ocsp-latest.yml | 2 +- .../{ => generated}/test/ocsp-rapid.yml | 2 +- .../test/require-api-version-5.0.yml | 2 +- .../test/require-api-version-6.0.yml | 2 +- .../test/require-api-version-7.0.yml | 2 +- .../test/require-api-version-latest.yml | 2 +- .../test/require-api-version-rapid.yml | 2 +- .../test/skip-crypt-shared-6.0.yml | 2 +- .../test/skip-crypt-shared-7.0.yml | 2 +- .../test/skip-crypt-shared-latest.yml | 2 +- .../test/skip-crypt-shared-rapid.yml | 2 +- .../build/build-libmongoc.yml} | 0 .../build/build-php.yml} | 0 .../test/load-balanced.yml} | 0 .../test/local.yml} | 0 .../test/ocsp.yml} | 0 .../test/require-api-version.yml} | 0 .../test/skip-crypt-shared.yml} | 0 .gitattributes | 6 +- 44 files changed, 89 insertions(+), 83 deletions(-) rename .evergreen/config/{ => generated}/build/build-libmongoc-8.2.yml (54%) rename .evergreen/config/{ => generated}/build/build-php-7.4.yml (61%) rename .evergreen/config/{ => generated}/build/build-php-8.0.yml (61%) rename .evergreen/config/{ => generated}/build/build-php-8.1.yml (61%) rename .evergreen/config/{ => generated}/build/build-php-8.2.yml (61%) rename .evergreen/config/{ => generated}/test/load-balanced-5.0.yml (79%) rename .evergreen/config/{ => generated}/test/load-balanced-6.0.yml (79%) rename .evergreen/config/{ => generated}/test/load-balanced-7.0.yml (79%) rename .evergreen/config/{ => generated}/test/load-balanced-latest.yml (79%) rename .evergreen/config/{ => generated}/test/load-balanced-rapid.yml (79%) rename .evergreen/config/{ => generated}/test/local-3.6.yml (93%) rename .evergreen/config/{ => generated}/test/local-4.0.yml (93%) rename .evergreen/config/{ => generated}/test/local-4.2.yml (93%) rename .evergreen/config/{ => generated}/test/local-4.4.yml (93%) rename .evergreen/config/{ => generated}/test/local-5.0.yml (93%) rename .evergreen/config/{ => generated}/test/local-6.0.yml (93%) rename .evergreen/config/{ => generated}/test/local-7.0.yml (93%) rename .evergreen/config/{ => generated}/test/local-latest.yml (94%) rename .evergreen/config/{ => generated}/test/local-rapid.yml (94%) rename .evergreen/config/{ => generated}/test/ocsp-4.4.yml (99%) rename .evergreen/config/{ => generated}/test/ocsp-5.0.yml (99%) rename .evergreen/config/{ => generated}/test/ocsp-6.0.yml (99%) rename .evergreen/config/{ => generated}/test/ocsp-7.0.yml (99%) rename .evergreen/config/{ => generated}/test/ocsp-latest.yml (99%) rename .evergreen/config/{ => generated}/test/ocsp-rapid.yml (99%) rename .evergreen/config/{ => generated}/test/require-api-version-5.0.yml (75%) rename .evergreen/config/{ => generated}/test/require-api-version-6.0.yml (75%) rename .evergreen/config/{ => generated}/test/require-api-version-7.0.yml (75%) rename .evergreen/config/{ => generated}/test/require-api-version-latest.yml (75%) rename .evergreen/config/{ => generated}/test/require-api-version-rapid.yml (75%) rename .evergreen/config/{ => generated}/test/skip-crypt-shared-6.0.yml (73%) rename .evergreen/config/{ => generated}/test/skip-crypt-shared-7.0.yml (73%) rename .evergreen/config/{ => generated}/test/skip-crypt-shared-latest.yml (73%) rename .evergreen/config/{ => generated}/test/skip-crypt-shared-rapid.yml (73%) rename .evergreen/config/{build/_template-build-libmongoc.yml => templates/build/build-libmongoc.yml} (100%) rename .evergreen/config/{build/_template-build-php.yml => templates/build/build-php.yml} (100%) rename .evergreen/config/{test/_template-load-balanced.yml => templates/test/load-balanced.yml} (100%) rename .evergreen/config/{test/_template-local.yml => templates/test/local.yml} (100%) rename .evergreen/config/{test/_template-ocsp.yml => templates/test/ocsp.yml} (100%) rename .evergreen/config/{test/_template-require-api-version.yml => templates/test/require-api-version.yml} (100%) rename .evergreen/config/{test/_template-skip-crypt-shared.yml => templates/test/skip-crypt-shared.yml} (100%) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 1164b52e9..f9441d647 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -46,37 +46,37 @@ include: - filename: .evergreen/config/test-variants.yml # Automatically generated files - - filename: .evergreen/config/build/build-php-8.2.yml - - filename: .evergreen/config/build/build-php-8.1.yml - - filename: .evergreen/config/build/build-php-8.0.yml - - filename: .evergreen/config/build/build-php-7.4.yml - - filename: .evergreen/config/build/build-libmongoc-8.2.yml - - filename: .evergreen/config/test/local-latest.yml - - filename: .evergreen/config/test/local-rapid.yml - - filename: .evergreen/config/test/local-7.0.yml - - filename: .evergreen/config/test/local-6.0.yml - - filename: .evergreen/config/test/local-5.0.yml - - filename: .evergreen/config/test/local-4.4.yml - - filename: .evergreen/config/test/local-4.2.yml - - filename: .evergreen/config/test/local-4.0.yml - - filename: .evergreen/config/test/local-3.6.yml - - filename: .evergreen/config/test/load-balanced-latest.yml - - filename: .evergreen/config/test/load-balanced-rapid.yml - - filename: .evergreen/config/test/load-balanced-7.0.yml - - filename: .evergreen/config/test/load-balanced-6.0.yml - - filename: .evergreen/config/test/load-balanced-5.0.yml - - filename: .evergreen/config/test/ocsp-latest.yml - - filename: .evergreen/config/test/ocsp-rapid.yml - - filename: .evergreen/config/test/ocsp-7.0.yml - - filename: .evergreen/config/test/ocsp-6.0.yml - - filename: .evergreen/config/test/ocsp-5.0.yml - - filename: .evergreen/config/test/ocsp-4.4.yml - - filename: .evergreen/config/test/require-api-version-latest.yml - - filename: .evergreen/config/test/require-api-version-rapid.yml - - filename: .evergreen/config/test/require-api-version-7.0.yml - - filename: .evergreen/config/test/require-api-version-6.0.yml - - filename: .evergreen/config/test/require-api-version-5.0.yml - - filename: .evergreen/config/test/skip-crypt-shared-latest.yml - - filename: .evergreen/config/test/skip-crypt-shared-rapid.yml - - filename: .evergreen/config/test/skip-crypt-shared-7.0.yml - - filename: .evergreen/config/test/skip-crypt-shared-6.0.yml + - filename: .evergreen/config/generated/build/build-php-8.2.yml + - filename: .evergreen/config/generated/build/build-php-8.1.yml + - filename: .evergreen/config/generated/build/build-php-8.0.yml + - filename: .evergreen/config/generated/build/build-php-7.4.yml + - filename: .evergreen/config/generated/build/build-libmongoc-8.2.yml + - filename: .evergreen/config/generated/test/local-latest.yml + - filename: .evergreen/config/generated/test/local-rapid.yml + - filename: .evergreen/config/generated/test/local-7.0.yml + - filename: .evergreen/config/generated/test/local-6.0.yml + - filename: .evergreen/config/generated/test/local-5.0.yml + - filename: .evergreen/config/generated/test/local-4.4.yml + - filename: .evergreen/config/generated/test/local-4.2.yml + - filename: .evergreen/config/generated/test/local-4.0.yml + - filename: .evergreen/config/generated/test/local-3.6.yml + - filename: .evergreen/config/generated/test/load-balanced-latest.yml + - filename: .evergreen/config/generated/test/load-balanced-rapid.yml + - filename: .evergreen/config/generated/test/load-balanced-7.0.yml + - filename: .evergreen/config/generated/test/load-balanced-6.0.yml + - filename: .evergreen/config/generated/test/load-balanced-5.0.yml + - filename: .evergreen/config/generated/test/ocsp-latest.yml + - filename: .evergreen/config/generated/test/ocsp-rapid.yml + - filename: .evergreen/config/generated/test/ocsp-7.0.yml + - filename: .evergreen/config/generated/test/ocsp-6.0.yml + - filename: .evergreen/config/generated/test/ocsp-5.0.yml + - filename: .evergreen/config/generated/test/ocsp-4.4.yml + - filename: .evergreen/config/generated/test/require-api-version-latest.yml + - filename: .evergreen/config/generated/test/require-api-version-rapid.yml + - filename: .evergreen/config/generated/test/require-api-version-7.0.yml + - filename: .evergreen/config/generated/test/require-api-version-6.0.yml + - filename: .evergreen/config/generated/test/require-api-version-5.0.yml + - filename: .evergreen/config/generated/test/skip-crypt-shared-latest.yml + - filename: .evergreen/config/generated/test/skip-crypt-shared-rapid.yml + - filename: .evergreen/config/generated/test/skip-crypt-shared-7.0.yml + - filename: .evergreen/config/generated/test/skip-crypt-shared-6.0.yml diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php index 0ecffd708..511107920 100644 --- a/.evergreen/config/generate-config.php +++ b/.evergreen/config/generate-config.php @@ -51,15 +51,15 @@ $allFiles = []; // Build tasks -$allFiles[] = generateConfigs('build', 'phpVersion', '_template-build-php.yml', 'build-php-%s', $supportedPhpVersions); -$allFiles[] = generateConfigs('build', 'phpVersion', '_template-build-libmongoc.yml', 'build-libmongoc-%s', $libmongocBuildPhpVersions); +$allFiles[] = generateConfigs('build', 'phpVersion', 'build-php.yml', 'build-php-%s', $supportedPhpVersions); +$allFiles[] = generateConfigs('build', 'phpVersion', 'build-libmongoc.yml', 'build-libmongoc-%s', $libmongocBuildPhpVersions); // Test tasks -$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-local.yml', 'local-%s', $localServerVersions); -$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions); -$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-ocsp.yml', 'ocsp-%s', $ocspServerVersions); -$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions); -$allFiles[] = generateConfigs('test', 'mongodbVersion', '_template-skip-crypt-shared.yml', 'skip-crypt-shared-%s', $skipCryptSharedServerVersions); +$allFiles[] = generateConfigs('test', 'mongodbVersion', 'local.yml', 'local-%s', $localServerVersions); +$allFiles[] = generateConfigs('test', 'mongodbVersion', 'load-balanced.yml', 'load-balanced-%s', $loadBalancedServerVersions); +$allFiles[] = generateConfigs('test', 'mongodbVersion', 'ocsp.yml', 'ocsp-%s', $ocspServerVersions); +$allFiles[] = generateConfigs('test', 'mongodbVersion', 'require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions); +$allFiles[] = generateConfigs('test', 'mongodbVersion', 'skip-crypt-shared.yml', 'skip-crypt-shared-%s', $skipCryptSharedServerVersions); echo "Generated config. Use the following list to import files:\n"; echo implode("\n", array_map('getImportConfig', array_merge(...$allFiles))) . "\n"; @@ -76,13 +76,17 @@ function generateConfigs( string $outputFormat, array $versions, ): array { - $template = file_get_contents(__DIR__ . '/' . $directory . '/' . $templateFile); - $header = '# This file is generated automatically - please edit the corresponding template file!'; + $templateRelativePath = 'templates/' . $directory . '/' . $templateFile; + $template = file_get_contents(__DIR__ . '/' . $templateRelativePath); + $header = sprintf( + '# This file is generated automatically - please edit the "%s" template file instead.', + $templateRelativePath + ); $files = []; foreach ($versions as $version) { - $filename = sprintf('/%s/' . $outputFormat . '.yml', $directory, $version); + $filename = sprintf('/generated/%s/' . $outputFormat . '.yml', $directory, $version); $files[] = '.evergreen/config' . $filename; $replacements = ['%' . $replacementName . '%' => $version]; diff --git a/.evergreen/config/build/build-libmongoc-8.2.yml b/.evergreen/config/generated/build/build-libmongoc-8.2.yml similarity index 54% rename from .evergreen/config/build/build-libmongoc-8.2.yml rename to .evergreen/config/generated/build/build-libmongoc-8.2.yml index 0b835836f..b22cbc327 100644 --- a/.evergreen/config/build/build-libmongoc-8.2.yml +++ b/.evergreen/config/generated/build/build-libmongoc-8.2.yml @@ -1,4 +1,10 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/build/build-libmongoc.yml" template file instead. +# The following tasks are used to build with different libmongoc versions. +# If libmongoc is not set to a stable version, disable the first two builds and only leave the last one enabled. +# When updating libmongoc to a stable release, make sure all builds are enabled. +# These tasks are used in the build task group "build-php-libmongoc" defined in .evergreen/config/build-task-groups.yml, +# where the "max_hosts" setting must be set to the number of enabled tasks. +# Last but not least, make sure the corresponding test variants are enabled in .evergreen/config/test-variants.yml tasks: # TODO: Enable the following two builds once libmongoc 1.25.0 is released # - name: "build-php-8.2-libmongoc-lowest-supported" diff --git a/.evergreen/config/build/build-php-7.4.yml b/.evergreen/config/generated/build/build-php-7.4.yml similarity index 61% rename from .evergreen/config/build/build-php-7.4.yml rename to .evergreen/config/generated/build/build-php-7.4.yml index 8e526e5dd..25f33e324 100644 --- a/.evergreen/config/build/build-php-7.4.yml +++ b/.evergreen/config/generated/build/build-php-7.4.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/build/build-php.yml" template file instead. tasks: - name: "build-php-7.4" tags: ["build", "php7.4"] diff --git a/.evergreen/config/build/build-php-8.0.yml b/.evergreen/config/generated/build/build-php-8.0.yml similarity index 61% rename from .evergreen/config/build/build-php-8.0.yml rename to .evergreen/config/generated/build/build-php-8.0.yml index f848af8cf..08eefbbc2 100644 --- a/.evergreen/config/build/build-php-8.0.yml +++ b/.evergreen/config/generated/build/build-php-8.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/build/build-php.yml" template file instead. tasks: - name: "build-php-8.0" tags: ["build", "php8.0"] diff --git a/.evergreen/config/build/build-php-8.1.yml b/.evergreen/config/generated/build/build-php-8.1.yml similarity index 61% rename from .evergreen/config/build/build-php-8.1.yml rename to .evergreen/config/generated/build/build-php-8.1.yml index fd89539ad..a3b09820c 100644 --- a/.evergreen/config/build/build-php-8.1.yml +++ b/.evergreen/config/generated/build/build-php-8.1.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/build/build-php.yml" template file instead. tasks: - name: "build-php-8.1" tags: ["build", "php8.1"] diff --git a/.evergreen/config/build/build-php-8.2.yml b/.evergreen/config/generated/build/build-php-8.2.yml similarity index 61% rename from .evergreen/config/build/build-php-8.2.yml rename to .evergreen/config/generated/build/build-php-8.2.yml index 61d899b7e..5ac6da211 100644 --- a/.evergreen/config/build/build-php-8.2.yml +++ b/.evergreen/config/generated/build/build-php-8.2.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/build/build-php.yml" template file instead. tasks: - name: "build-php-8.2" tags: ["build", "php8.2"] diff --git a/.evergreen/config/test/load-balanced-5.0.yml b/.evergreen/config/generated/test/load-balanced-5.0.yml similarity index 79% rename from .evergreen/config/test/load-balanced-5.0.yml rename to .evergreen/config/generated/test/load-balanced-5.0.yml index b632cf4d8..13821fe11 100644 --- a/.evergreen/config/test/load-balanced-5.0.yml +++ b/.evergreen/config/generated/test/load-balanced-5.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-5.0-loadbalanced" tags: ["sharded", "local", "5.0", "loadbalanced"] diff --git a/.evergreen/config/test/load-balanced-6.0.yml b/.evergreen/config/generated/test/load-balanced-6.0.yml similarity index 79% rename from .evergreen/config/test/load-balanced-6.0.yml rename to .evergreen/config/generated/test/load-balanced-6.0.yml index 6c4aca8b0..9da56b01e 100644 --- a/.evergreen/config/test/load-balanced-6.0.yml +++ b/.evergreen/config/generated/test/load-balanced-6.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-6.0-loadbalanced" tags: ["sharded", "local", "6.0", "loadbalanced"] diff --git a/.evergreen/config/test/load-balanced-7.0.yml b/.evergreen/config/generated/test/load-balanced-7.0.yml similarity index 79% rename from .evergreen/config/test/load-balanced-7.0.yml rename to .evergreen/config/generated/test/load-balanced-7.0.yml index 0e0faf363..300243e38 100644 --- a/.evergreen/config/test/load-balanced-7.0.yml +++ b/.evergreen/config/generated/test/load-balanced-7.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-7.0-loadbalanced" tags: ["sharded", "local", "7.0", "loadbalanced"] diff --git a/.evergreen/config/test/load-balanced-latest.yml b/.evergreen/config/generated/test/load-balanced-latest.yml similarity index 79% rename from .evergreen/config/test/load-balanced-latest.yml rename to .evergreen/config/generated/test/load-balanced-latest.yml index b906338f3..3f16d0eb6 100644 --- a/.evergreen/config/test/load-balanced-latest.yml +++ b/.evergreen/config/generated/test/load-balanced-latest.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-latest-loadbalanced" tags: ["sharded", "local", "latest", "loadbalanced"] diff --git a/.evergreen/config/test/load-balanced-rapid.yml b/.evergreen/config/generated/test/load-balanced-rapid.yml similarity index 79% rename from .evergreen/config/test/load-balanced-rapid.yml rename to .evergreen/config/generated/test/load-balanced-rapid.yml index b9c45d5fa..660e7417f 100644 --- a/.evergreen/config/test/load-balanced-rapid.yml +++ b/.evergreen/config/generated/test/load-balanced-rapid.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-rapid-loadbalanced" tags: ["sharded", "local", "rapid", "loadbalanced"] diff --git a/.evergreen/config/test/local-3.6.yml b/.evergreen/config/generated/test/local-3.6.yml similarity index 93% rename from .evergreen/config/test/local-3.6.yml rename to .evergreen/config/generated/test/local-3.6.yml index 32d9c7b55..2dd1fd61e 100644 --- a/.evergreen/config/test/local-3.6.yml +++ b/.evergreen/config/generated/test/local-3.6.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-3.6-standalone-noauth-nossl" tags: ["standalone", "local", "3.6"] diff --git a/.evergreen/config/test/local-4.0.yml b/.evergreen/config/generated/test/local-4.0.yml similarity index 93% rename from .evergreen/config/test/local-4.0.yml rename to .evergreen/config/generated/test/local-4.0.yml index 7b9a155ef..08c956ca1 100644 --- a/.evergreen/config/test/local-4.0.yml +++ b/.evergreen/config/generated/test/local-4.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-4.0-standalone-noauth-nossl" tags: ["standalone", "local", "4.0"] diff --git a/.evergreen/config/test/local-4.2.yml b/.evergreen/config/generated/test/local-4.2.yml similarity index 93% rename from .evergreen/config/test/local-4.2.yml rename to .evergreen/config/generated/test/local-4.2.yml index f65f9ab73..bbf641e49 100644 --- a/.evergreen/config/test/local-4.2.yml +++ b/.evergreen/config/generated/test/local-4.2.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-4.2-standalone-noauth-nossl" tags: ["standalone", "local", "4.2"] diff --git a/.evergreen/config/test/local-4.4.yml b/.evergreen/config/generated/test/local-4.4.yml similarity index 93% rename from .evergreen/config/test/local-4.4.yml rename to .evergreen/config/generated/test/local-4.4.yml index 5a0cca7b2..1d42f6a22 100644 --- a/.evergreen/config/test/local-4.4.yml +++ b/.evergreen/config/generated/test/local-4.4.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-4.4-standalone-noauth-nossl" tags: ["standalone", "local", "4.4"] diff --git a/.evergreen/config/test/local-5.0.yml b/.evergreen/config/generated/test/local-5.0.yml similarity index 93% rename from .evergreen/config/test/local-5.0.yml rename to .evergreen/config/generated/test/local-5.0.yml index 2ebbc27ea..4da831804 100644 --- a/.evergreen/config/test/local-5.0.yml +++ b/.evergreen/config/generated/test/local-5.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-5.0-standalone-noauth-nossl" tags: ["standalone", "local", "5.0"] diff --git a/.evergreen/config/test/local-6.0.yml b/.evergreen/config/generated/test/local-6.0.yml similarity index 93% rename from .evergreen/config/test/local-6.0.yml rename to .evergreen/config/generated/test/local-6.0.yml index 70f9f5c95..423e90afb 100644 --- a/.evergreen/config/test/local-6.0.yml +++ b/.evergreen/config/generated/test/local-6.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-6.0-standalone-noauth-nossl" tags: ["standalone", "local", "6.0"] diff --git a/.evergreen/config/test/local-7.0.yml b/.evergreen/config/generated/test/local-7.0.yml similarity index 93% rename from .evergreen/config/test/local-7.0.yml rename to .evergreen/config/generated/test/local-7.0.yml index 77e47ab9f..3507ac422 100644 --- a/.evergreen/config/test/local-7.0.yml +++ b/.evergreen/config/generated/test/local-7.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-7.0-standalone-noauth-nossl" tags: ["standalone", "local", "7.0"] diff --git a/.evergreen/config/test/local-latest.yml b/.evergreen/config/generated/test/local-latest.yml similarity index 94% rename from .evergreen/config/test/local-latest.yml rename to .evergreen/config/generated/test/local-latest.yml index 505d7edd4..df26a456e 100644 --- a/.evergreen/config/test/local-latest.yml +++ b/.evergreen/config/generated/test/local-latest.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-latest-standalone-noauth-nossl" tags: ["standalone", "local", "latest"] diff --git a/.evergreen/config/test/local-rapid.yml b/.evergreen/config/generated/test/local-rapid.yml similarity index 94% rename from .evergreen/config/test/local-rapid.yml rename to .evergreen/config/generated/test/local-rapid.yml index 15196042a..04fbeb612 100644 --- a/.evergreen/config/test/local-rapid.yml +++ b/.evergreen/config/generated/test/local-rapid.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/local.yml" template file instead. tasks: - name: "test-mongodb-rapid-standalone-noauth-nossl" tags: ["standalone", "local", "rapid"] diff --git a/.evergreen/config/test/ocsp-4.4.yml b/.evergreen/config/generated/test/ocsp-4.4.yml similarity index 99% rename from .evergreen/config/test/ocsp-4.4.yml rename to .evergreen/config/generated/test/ocsp-4.4.yml index 9c49fcfb6..ad3d2568f 100644 --- a/.evergreen/config/test/ocsp-4.4.yml +++ b/.evergreen/config/generated/test/ocsp-4.4.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/ocsp.yml" template file instead. tasks: - name: "ocsp-test_1-rsa-delegate-4.4" tags: ["ocsp", "4.4"] diff --git a/.evergreen/config/test/ocsp-5.0.yml b/.evergreen/config/generated/test/ocsp-5.0.yml similarity index 99% rename from .evergreen/config/test/ocsp-5.0.yml rename to .evergreen/config/generated/test/ocsp-5.0.yml index 8bd577780..5ffc54f1e 100644 --- a/.evergreen/config/test/ocsp-5.0.yml +++ b/.evergreen/config/generated/test/ocsp-5.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/ocsp.yml" template file instead. tasks: - name: "ocsp-test_1-rsa-delegate-5.0" tags: ["ocsp", "5.0"] diff --git a/.evergreen/config/test/ocsp-6.0.yml b/.evergreen/config/generated/test/ocsp-6.0.yml similarity index 99% rename from .evergreen/config/test/ocsp-6.0.yml rename to .evergreen/config/generated/test/ocsp-6.0.yml index 5498c7774..4921320ac 100644 --- a/.evergreen/config/test/ocsp-6.0.yml +++ b/.evergreen/config/generated/test/ocsp-6.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/ocsp.yml" template file instead. tasks: - name: "ocsp-test_1-rsa-delegate-6.0" tags: ["ocsp", "6.0"] diff --git a/.evergreen/config/test/ocsp-7.0.yml b/.evergreen/config/generated/test/ocsp-7.0.yml similarity index 99% rename from .evergreen/config/test/ocsp-7.0.yml rename to .evergreen/config/generated/test/ocsp-7.0.yml index 6941222c0..83e448704 100644 --- a/.evergreen/config/test/ocsp-7.0.yml +++ b/.evergreen/config/generated/test/ocsp-7.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/ocsp.yml" template file instead. tasks: - name: "ocsp-test_1-rsa-delegate-7.0" tags: ["ocsp", "7.0"] diff --git a/.evergreen/config/test/ocsp-latest.yml b/.evergreen/config/generated/test/ocsp-latest.yml similarity index 99% rename from .evergreen/config/test/ocsp-latest.yml rename to .evergreen/config/generated/test/ocsp-latest.yml index 3a90bd67a..9aea81976 100644 --- a/.evergreen/config/test/ocsp-latest.yml +++ b/.evergreen/config/generated/test/ocsp-latest.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/ocsp.yml" template file instead. tasks: - name: "ocsp-test_1-rsa-delegate-latest" tags: ["ocsp", "latest"] diff --git a/.evergreen/config/test/ocsp-rapid.yml b/.evergreen/config/generated/test/ocsp-rapid.yml similarity index 99% rename from .evergreen/config/test/ocsp-rapid.yml rename to .evergreen/config/generated/test/ocsp-rapid.yml index 3eab07504..ec8a71777 100644 --- a/.evergreen/config/test/ocsp-rapid.yml +++ b/.evergreen/config/generated/test/ocsp-rapid.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/ocsp.yml" template file instead. tasks: - name: "ocsp-test_1-rsa-delegate-rapid" tags: ["ocsp", "rapid"] diff --git a/.evergreen/config/test/require-api-version-5.0.yml b/.evergreen/config/generated/test/require-api-version-5.0.yml similarity index 75% rename from .evergreen/config/test/require-api-version-5.0.yml rename to .evergreen/config/generated/test/require-api-version-5.0.yml index a493a787f..903fbacaf 100644 --- a/.evergreen/config/test/require-api-version-5.0.yml +++ b/.evergreen/config/generated/test/require-api-version-5.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead. tasks: - name: "test-requireApiVersion-5.0" tags: [ "standalone", "local", "5.0", "versioned_api" ] diff --git a/.evergreen/config/test/require-api-version-6.0.yml b/.evergreen/config/generated/test/require-api-version-6.0.yml similarity index 75% rename from .evergreen/config/test/require-api-version-6.0.yml rename to .evergreen/config/generated/test/require-api-version-6.0.yml index 76a7d43ce..30f7ae483 100644 --- a/.evergreen/config/test/require-api-version-6.0.yml +++ b/.evergreen/config/generated/test/require-api-version-6.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead. tasks: - name: "test-requireApiVersion-6.0" tags: [ "standalone", "local", "6.0", "versioned_api" ] diff --git a/.evergreen/config/test/require-api-version-7.0.yml b/.evergreen/config/generated/test/require-api-version-7.0.yml similarity index 75% rename from .evergreen/config/test/require-api-version-7.0.yml rename to .evergreen/config/generated/test/require-api-version-7.0.yml index 62800cff7..9a83ee346 100644 --- a/.evergreen/config/test/require-api-version-7.0.yml +++ b/.evergreen/config/generated/test/require-api-version-7.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead. tasks: - name: "test-requireApiVersion-7.0" tags: [ "standalone", "local", "7.0", "versioned_api" ] diff --git a/.evergreen/config/test/require-api-version-latest.yml b/.evergreen/config/generated/test/require-api-version-latest.yml similarity index 75% rename from .evergreen/config/test/require-api-version-latest.yml rename to .evergreen/config/generated/test/require-api-version-latest.yml index 6d54258e5..16a07f156 100644 --- a/.evergreen/config/test/require-api-version-latest.yml +++ b/.evergreen/config/generated/test/require-api-version-latest.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead. tasks: - name: "test-requireApiVersion-latest" tags: [ "standalone", "local", "latest", "versioned_api" ] diff --git a/.evergreen/config/test/require-api-version-rapid.yml b/.evergreen/config/generated/test/require-api-version-rapid.yml similarity index 75% rename from .evergreen/config/test/require-api-version-rapid.yml rename to .evergreen/config/generated/test/require-api-version-rapid.yml index 87fc7bedd..abc74d406 100644 --- a/.evergreen/config/test/require-api-version-rapid.yml +++ b/.evergreen/config/generated/test/require-api-version-rapid.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/require-api-version.yml" template file instead. tasks: - name: "test-requireApiVersion-rapid" tags: [ "standalone", "local", "rapid", "versioned_api" ] diff --git a/.evergreen/config/test/skip-crypt-shared-6.0.yml b/.evergreen/config/generated/test/skip-crypt-shared-6.0.yml similarity index 73% rename from .evergreen/config/test/skip-crypt-shared-6.0.yml rename to .evergreen/config/generated/test/skip-crypt-shared-6.0.yml index e49538c34..e2e07bb8d 100644 --- a/.evergreen/config/test/skip-crypt-shared-6.0.yml +++ b/.evergreen/config/generated/test/skip-crypt-shared-6.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/skip-crypt-shared.yml" template file instead. tasks: - name: "test-skip_crypt_shared-6.0" tags: [ "replicaset", "local", "6.0", "skip_crypt_shared" ] diff --git a/.evergreen/config/test/skip-crypt-shared-7.0.yml b/.evergreen/config/generated/test/skip-crypt-shared-7.0.yml similarity index 73% rename from .evergreen/config/test/skip-crypt-shared-7.0.yml rename to .evergreen/config/generated/test/skip-crypt-shared-7.0.yml index 3330ecc50..ad244fa84 100644 --- a/.evergreen/config/test/skip-crypt-shared-7.0.yml +++ b/.evergreen/config/generated/test/skip-crypt-shared-7.0.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/skip-crypt-shared.yml" template file instead. tasks: - name: "test-skip_crypt_shared-7.0" tags: [ "replicaset", "local", "7.0", "skip_crypt_shared" ] diff --git a/.evergreen/config/test/skip-crypt-shared-latest.yml b/.evergreen/config/generated/test/skip-crypt-shared-latest.yml similarity index 73% rename from .evergreen/config/test/skip-crypt-shared-latest.yml rename to .evergreen/config/generated/test/skip-crypt-shared-latest.yml index 58209ba1c..9f5c10eb9 100644 --- a/.evergreen/config/test/skip-crypt-shared-latest.yml +++ b/.evergreen/config/generated/test/skip-crypt-shared-latest.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/skip-crypt-shared.yml" template file instead. tasks: - name: "test-skip_crypt_shared-latest" tags: [ "replicaset", "local", "latest", "skip_crypt_shared" ] diff --git a/.evergreen/config/test/skip-crypt-shared-rapid.yml b/.evergreen/config/generated/test/skip-crypt-shared-rapid.yml similarity index 73% rename from .evergreen/config/test/skip-crypt-shared-rapid.yml rename to .evergreen/config/generated/test/skip-crypt-shared-rapid.yml index 3e2487b50..208ef05a3 100644 --- a/.evergreen/config/test/skip-crypt-shared-rapid.yml +++ b/.evergreen/config/generated/test/skip-crypt-shared-rapid.yml @@ -1,4 +1,4 @@ -# This file is generated automatically - please edit the corresponding template file! +# This file is generated automatically - please edit the "templates/test/skip-crypt-shared.yml" template file instead. tasks: - name: "test-skip_crypt_shared-rapid" tags: [ "replicaset", "local", "rapid", "skip_crypt_shared" ] diff --git a/.evergreen/config/build/_template-build-libmongoc.yml b/.evergreen/config/templates/build/build-libmongoc.yml similarity index 100% rename from .evergreen/config/build/_template-build-libmongoc.yml rename to .evergreen/config/templates/build/build-libmongoc.yml diff --git a/.evergreen/config/build/_template-build-php.yml b/.evergreen/config/templates/build/build-php.yml similarity index 100% rename from .evergreen/config/build/_template-build-php.yml rename to .evergreen/config/templates/build/build-php.yml diff --git a/.evergreen/config/test/_template-load-balanced.yml b/.evergreen/config/templates/test/load-balanced.yml similarity index 100% rename from .evergreen/config/test/_template-load-balanced.yml rename to .evergreen/config/templates/test/load-balanced.yml diff --git a/.evergreen/config/test/_template-local.yml b/.evergreen/config/templates/test/local.yml similarity index 100% rename from .evergreen/config/test/_template-local.yml rename to .evergreen/config/templates/test/local.yml diff --git a/.evergreen/config/test/_template-ocsp.yml b/.evergreen/config/templates/test/ocsp.yml similarity index 100% rename from .evergreen/config/test/_template-ocsp.yml rename to .evergreen/config/templates/test/ocsp.yml diff --git a/.evergreen/config/test/_template-require-api-version.yml b/.evergreen/config/templates/test/require-api-version.yml similarity index 100% rename from .evergreen/config/test/_template-require-api-version.yml rename to .evergreen/config/templates/test/require-api-version.yml diff --git a/.evergreen/config/test/_template-skip-crypt-shared.yml b/.evergreen/config/templates/test/skip-crypt-shared.yml similarity index 100% rename from .evergreen/config/test/_template-skip-crypt-shared.yml rename to .evergreen/config/templates/test/skip-crypt-shared.yml diff --git a/.gitattributes b/.gitattributes index ad604c940..309faa770 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1 @@ -.evergreen/config/build/*.yml linguist-generated=true -.evergreen/config/build/_template*.yml linguist-generated=false - -.evergreen/config/test/*.yml linguist-generated=true -.evergreen/config/test/_template*.yml linguist-generated=false +.evergreen/config/generated/** linguist-generated=true From acf1eb7ff900a7a2b9c35523cc7056f1b4ebf818 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 9 Oct 2023 10:29:20 +0200 Subject: [PATCH 40/44] Add blank lines to task files for readability --- .../generated/build/build-libmongoc-8.2.yml | 2 ++ .../config/generated/test/local-3.6.yml | 3 +++ .../config/generated/test/local-4.0.yml | 3 +++ .../config/generated/test/local-4.2.yml | 3 +++ .../config/generated/test/local-4.4.yml | 3 +++ .../config/generated/test/local-5.0.yml | 3 +++ .../config/generated/test/local-6.0.yml | 3 +++ .../config/generated/test/local-7.0.yml | 3 +++ .../config/generated/test/local-latest.yml | 3 +++ .../config/generated/test/local-rapid.yml | 3 +++ .evergreen/config/generated/test/ocsp-4.4.yml | 23 +++++++++++++++++++ .evergreen/config/generated/test/ocsp-5.0.yml | 23 +++++++++++++++++++ .evergreen/config/generated/test/ocsp-6.0.yml | 23 +++++++++++++++++++ .evergreen/config/generated/test/ocsp-7.0.yml | 23 +++++++++++++++++++ .../config/generated/test/ocsp-latest.yml | 23 +++++++++++++++++++ .../config/generated/test/ocsp-rapid.yml | 23 +++++++++++++++++++ .../templates/build/build-libmongoc.yml | 2 ++ .evergreen/config/templates/test/local.yml | 3 +++ .evergreen/config/templates/test/ocsp.yml | 23 +++++++++++++++++++ 19 files changed, 195 insertions(+) diff --git a/.evergreen/config/generated/build/build-libmongoc-8.2.yml b/.evergreen/config/generated/build/build-libmongoc-8.2.yml index b22cbc327..b8d9257f0 100644 --- a/.evergreen/config/generated/build/build-libmongoc-8.2.yml +++ b/.evergreen/config/generated/build/build-libmongoc-8.2.yml @@ -15,6 +15,7 @@ tasks: # PHP_VERSION: "8.2" # LIBMONGOC_VERSION: "1.25.0" # - func: "upload build" + # - name: "build-php-8.2-libmongoc-next-stable" # tags: ["build-libmongoc", "php8.2"] # commands: @@ -23,6 +24,7 @@ tasks: # PHP_VERSION: "8.2" # LIBMONGOC_VERSION: "r1.25" # - func: "upload build" + - name: "build-php-8.2-libmongoc-latest" tags: ["build-libmongoc", "php8.2"] commands: diff --git a/.evergreen/config/generated/test/local-3.6.yml b/.evergreen/config/generated/test/local-3.6.yml index 2dd1fd61e..eec31f7bd 100644 --- a/.evergreen/config/generated/test/local-3.6.yml +++ b/.evergreen/config/generated/test/local-3.6.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "3.6" - func: "run tests" + - name: "test-mongodb-3.6-standalone-auth" tags: ["standalone", "local", "3.6", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "3.6" - func: "run tests" + - name: "test-mongodb-3.6-standalone-ssl" tags: ["standalone", "local", "3.6", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "3.6" - func: "run tests" + - name: "test-mongodb-3.6-replicaset-auth" tags: ["replicaset", "local", "3.6", "auth"] commands: diff --git a/.evergreen/config/generated/test/local-4.0.yml b/.evergreen/config/generated/test/local-4.0.yml index 08c956ca1..1ed849111 100644 --- a/.evergreen/config/generated/test/local-4.0.yml +++ b/.evergreen/config/generated/test/local-4.0.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "4.0" - func: "run tests" + - name: "test-mongodb-4.0-standalone-auth" tags: ["standalone", "local", "4.0", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.0" - func: "run tests" + - name: "test-mongodb-4.0-standalone-ssl" tags: ["standalone", "local", "4.0", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "4.0" - func: "run tests" + - name: "test-mongodb-4.0-replicaset-auth" tags: ["replicaset", "local", "4.0", "auth"] commands: diff --git a/.evergreen/config/generated/test/local-4.2.yml b/.evergreen/config/generated/test/local-4.2.yml index bbf641e49..0c690e4bc 100644 --- a/.evergreen/config/generated/test/local-4.2.yml +++ b/.evergreen/config/generated/test/local-4.2.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "4.2" - func: "run tests" + - name: "test-mongodb-4.2-standalone-auth" tags: ["standalone", "local", "4.2", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.2" - func: "run tests" + - name: "test-mongodb-4.2-standalone-ssl" tags: ["standalone", "local", "4.2", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "4.2" - func: "run tests" + - name: "test-mongodb-4.2-replicaset-auth" tags: ["replicaset", "local", "4.2", "auth"] commands: diff --git a/.evergreen/config/generated/test/local-4.4.yml b/.evergreen/config/generated/test/local-4.4.yml index 1d42f6a22..081e09ee2 100644 --- a/.evergreen/config/generated/test/local-4.4.yml +++ b/.evergreen/config/generated/test/local-4.4.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "4.4" - func: "run tests" + - name: "test-mongodb-4.4-standalone-auth" tags: ["standalone", "local", "4.4", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "4.4" - func: "run tests" + - name: "test-mongodb-4.4-standalone-ssl" tags: ["standalone", "local", "4.4", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "4.4" - func: "run tests" + - name: "test-mongodb-4.4-replicaset-auth" tags: ["replicaset", "local", "4.4", "auth"] commands: diff --git a/.evergreen/config/generated/test/local-5.0.yml b/.evergreen/config/generated/test/local-5.0.yml index 4da831804..80b8f8533 100644 --- a/.evergreen/config/generated/test/local-5.0.yml +++ b/.evergreen/config/generated/test/local-5.0.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "5.0" - func: "run tests" + - name: "test-mongodb-5.0-standalone-auth" tags: ["standalone", "local", "5.0", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "5.0" - func: "run tests" + - name: "test-mongodb-5.0-standalone-ssl" tags: ["standalone", "local", "5.0", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "5.0" - func: "run tests" + - name: "test-mongodb-5.0-replicaset-auth" tags: ["replicaset", "local", "5.0", "auth"] commands: diff --git a/.evergreen/config/generated/test/local-6.0.yml b/.evergreen/config/generated/test/local-6.0.yml index 423e90afb..a9be6fb98 100644 --- a/.evergreen/config/generated/test/local-6.0.yml +++ b/.evergreen/config/generated/test/local-6.0.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "6.0" - func: "run tests" + - name: "test-mongodb-6.0-standalone-auth" tags: ["standalone", "local", "6.0", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "6.0" - func: "run tests" + - name: "test-mongodb-6.0-standalone-ssl" tags: ["standalone", "local", "6.0", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "6.0" - func: "run tests" + - name: "test-mongodb-6.0-replicaset-auth" tags: ["replicaset", "local", "6.0", "auth"] commands: diff --git a/.evergreen/config/generated/test/local-7.0.yml b/.evergreen/config/generated/test/local-7.0.yml index 3507ac422..354723d6a 100644 --- a/.evergreen/config/generated/test/local-7.0.yml +++ b/.evergreen/config/generated/test/local-7.0.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "7.0" - func: "run tests" + - name: "test-mongodb-7.0-standalone-auth" tags: ["standalone", "local", "7.0", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "7.0" - func: "run tests" + - name: "test-mongodb-7.0-standalone-ssl" tags: ["standalone", "local", "7.0", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "7.0" - func: "run tests" + - name: "test-mongodb-7.0-replicaset-auth" tags: ["replicaset", "local", "7.0", "auth"] commands: diff --git a/.evergreen/config/generated/test/local-latest.yml b/.evergreen/config/generated/test/local-latest.yml index df26a456e..192fb6606 100644 --- a/.evergreen/config/generated/test/local-latest.yml +++ b/.evergreen/config/generated/test/local-latest.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "latest" - func: "run tests" + - name: "test-mongodb-latest-standalone-auth" tags: ["standalone", "local", "latest", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "latest" - func: "run tests" + - name: "test-mongodb-latest-standalone-ssl" tags: ["standalone", "local", "latest", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "latest" - func: "run tests" + - name: "test-mongodb-latest-replicaset-auth" tags: ["replicaset", "local", "latest", "auth"] commands: diff --git a/.evergreen/config/generated/test/local-rapid.yml b/.evergreen/config/generated/test/local-rapid.yml index 04fbeb612..ed82b3527 100644 --- a/.evergreen/config/generated/test/local-rapid.yml +++ b/.evergreen/config/generated/test/local-rapid.yml @@ -8,6 +8,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "rapid" - func: "run tests" + - name: "test-mongodb-rapid-standalone-auth" tags: ["standalone", "local", "rapid", "auth"] commands: @@ -17,6 +18,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "rapid" - func: "run tests" + - name: "test-mongodb-rapid-standalone-ssl" tags: ["standalone", "local", "rapid", "ssl"] commands: @@ -37,6 +39,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "rapid" - func: "run tests" + - name: "test-mongodb-rapid-replicaset-auth" tags: ["replicaset", "local", "rapid", "auth"] commands: diff --git a/.evergreen/config/generated/test/ocsp-4.4.yml b/.evergreen/config/generated/test/ocsp-4.4.yml index ad3d2568f..07809715b 100644 --- a/.evergreen/config/generated/test/ocsp-4.4.yml +++ b/.evergreen/config/generated/test/ocsp-4.4.yml @@ -17,6 +17,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -34,6 +35,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -51,6 +53,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -68,6 +71,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -85,6 +89,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -102,6 +107,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -119,6 +125,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -136,6 +143,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -153,6 +161,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -170,6 +179,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -187,6 +197,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -204,6 +215,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -221,6 +233,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -238,6 +251,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -255,6 +269,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -272,6 +287,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-4.4" tags: ["ocsp", "4.4"] commands: @@ -284,6 +300,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-4.4" tags: ["ocsp", "4.4"] commands: @@ -296,6 +313,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -313,6 +331,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -330,6 +349,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -347,6 +367,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-4.4" tags: ["ocsp", "4.4"] commands: @@ -364,6 +385,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-4.4" tags: ["ocsp", "4.4"] commands: @@ -376,6 +398,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-4.4" tags: ["ocsp", "4.4"] commands: diff --git a/.evergreen/config/generated/test/ocsp-5.0.yml b/.evergreen/config/generated/test/ocsp-5.0.yml index 5ffc54f1e..38ecb5688 100644 --- a/.evergreen/config/generated/test/ocsp-5.0.yml +++ b/.evergreen/config/generated/test/ocsp-5.0.yml @@ -17,6 +17,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -34,6 +35,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -51,6 +53,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -68,6 +71,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -85,6 +89,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -102,6 +107,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -119,6 +125,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -136,6 +143,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -153,6 +161,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -170,6 +179,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -187,6 +197,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -204,6 +215,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -221,6 +233,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -238,6 +251,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -255,6 +269,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -272,6 +287,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-5.0" tags: ["ocsp", "5.0"] commands: @@ -284,6 +300,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-5.0" tags: ["ocsp", "5.0"] commands: @@ -296,6 +313,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -313,6 +331,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -330,6 +349,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -347,6 +367,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-5.0" tags: ["ocsp", "5.0"] commands: @@ -364,6 +385,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-5.0" tags: ["ocsp", "5.0"] commands: @@ -376,6 +398,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-5.0" tags: ["ocsp", "5.0"] commands: diff --git a/.evergreen/config/generated/test/ocsp-6.0.yml b/.evergreen/config/generated/test/ocsp-6.0.yml index 4921320ac..ee41b63b5 100644 --- a/.evergreen/config/generated/test/ocsp-6.0.yml +++ b/.evergreen/config/generated/test/ocsp-6.0.yml @@ -17,6 +17,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -34,6 +35,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -51,6 +53,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -68,6 +71,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -85,6 +89,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -102,6 +107,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -119,6 +125,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -136,6 +143,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -153,6 +161,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -170,6 +179,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -187,6 +197,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -204,6 +215,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -221,6 +233,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -238,6 +251,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -255,6 +269,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -272,6 +287,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-6.0" tags: ["ocsp", "6.0"] commands: @@ -284,6 +300,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-6.0" tags: ["ocsp", "6.0"] commands: @@ -296,6 +313,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -313,6 +331,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -330,6 +349,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -347,6 +367,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-6.0" tags: ["ocsp", "6.0"] commands: @@ -364,6 +385,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-6.0" tags: ["ocsp", "6.0"] commands: @@ -376,6 +398,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-6.0" tags: ["ocsp", "6.0"] commands: diff --git a/.evergreen/config/generated/test/ocsp-7.0.yml b/.evergreen/config/generated/test/ocsp-7.0.yml index 83e448704..0d9515119 100644 --- a/.evergreen/config/generated/test/ocsp-7.0.yml +++ b/.evergreen/config/generated/test/ocsp-7.0.yml @@ -17,6 +17,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -34,6 +35,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -51,6 +53,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -68,6 +71,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -85,6 +89,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -102,6 +107,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -119,6 +125,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -136,6 +143,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -153,6 +161,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -170,6 +179,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -187,6 +197,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -204,6 +215,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -221,6 +233,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -238,6 +251,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -255,6 +269,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -272,6 +287,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-7.0" tags: ["ocsp", "7.0"] commands: @@ -284,6 +300,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-7.0" tags: ["ocsp", "7.0"] commands: @@ -296,6 +313,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -313,6 +331,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -330,6 +349,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -347,6 +367,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-7.0" tags: ["ocsp", "7.0"] commands: @@ -364,6 +385,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-7.0" tags: ["ocsp", "7.0"] commands: @@ -376,6 +398,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-7.0" tags: ["ocsp", "7.0"] commands: diff --git a/.evergreen/config/generated/test/ocsp-latest.yml b/.evergreen/config/generated/test/ocsp-latest.yml index 9aea81976..7143fae35 100644 --- a/.evergreen/config/generated/test/ocsp-latest.yml +++ b/.evergreen/config/generated/test/ocsp-latest.yml @@ -17,6 +17,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -34,6 +35,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -51,6 +53,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -68,6 +71,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -85,6 +89,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -102,6 +107,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -119,6 +125,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -136,6 +143,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -153,6 +161,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -170,6 +179,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -187,6 +197,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -204,6 +215,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -221,6 +233,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -238,6 +251,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -255,6 +269,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -272,6 +287,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-latest" tags: ["ocsp", "latest"] commands: @@ -284,6 +300,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-latest" tags: ["ocsp", "latest"] commands: @@ -296,6 +313,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -313,6 +331,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-latest" tags: ["ocsp", "latest"] commands: @@ -330,6 +349,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -347,6 +367,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-latest" tags: ["ocsp", "latest"] commands: @@ -364,6 +385,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-latest" tags: ["ocsp", "latest"] commands: @@ -376,6 +398,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-latest" tags: ["ocsp", "latest"] commands: diff --git a/.evergreen/config/generated/test/ocsp-rapid.yml b/.evergreen/config/generated/test/ocsp-rapid.yml index ec8a71777..e7a1a74d6 100644 --- a/.evergreen/config/generated/test/ocsp-rapid.yml +++ b/.evergreen/config/generated/test/ocsp-rapid.yml @@ -17,6 +17,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -34,6 +35,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -51,6 +53,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -68,6 +71,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -85,6 +89,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -102,6 +107,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -119,6 +125,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -136,6 +143,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -153,6 +161,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -170,6 +179,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -187,6 +197,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -204,6 +215,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -221,6 +233,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -238,6 +251,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -255,6 +269,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -272,6 +287,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-rapid" tags: ["ocsp", "rapid"] commands: @@ -284,6 +300,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-rapid" tags: ["ocsp", "rapid"] commands: @@ -296,6 +313,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -313,6 +331,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -330,6 +349,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -347,6 +367,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-rapid" tags: ["ocsp", "rapid"] commands: @@ -364,6 +385,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-rapid" tags: ["ocsp", "rapid"] commands: @@ -376,6 +398,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-rapid" tags: ["ocsp", "rapid"] commands: diff --git a/.evergreen/config/templates/build/build-libmongoc.yml b/.evergreen/config/templates/build/build-libmongoc.yml index cdc206683..d5237272c 100644 --- a/.evergreen/config/templates/build/build-libmongoc.yml +++ b/.evergreen/config/templates/build/build-libmongoc.yml @@ -14,6 +14,7 @@ tasks: # PHP_VERSION: "%phpVersion%" # LIBMONGOC_VERSION: "1.25.0" # - func: "upload build" + # - name: "build-php-%phpVersion%-libmongoc-next-stable" # tags: ["build-libmongoc", "php%phpVersion%"] # commands: @@ -22,6 +23,7 @@ tasks: # PHP_VERSION: "%phpVersion%" # LIBMONGOC_VERSION: "r1.25" # - func: "upload build" + - name: "build-php-%phpVersion%-libmongoc-latest" tags: ["build-libmongoc", "php%phpVersion%"] commands: diff --git a/.evergreen/config/templates/test/local.yml b/.evergreen/config/templates/test/local.yml index 649fafce9..c2d5626d1 100644 --- a/.evergreen/config/templates/test/local.yml +++ b/.evergreen/config/templates/test/local.yml @@ -7,6 +7,7 @@ tasks: TOPOLOGY: "server" MONGODB_VERSION: "%mongodbVersion%" - func: "run tests" + - name: "test-mongodb-%mongodbVersion%-standalone-auth" tags: ["standalone", "local", "%mongodbVersion%", "auth"] commands: @@ -16,6 +17,7 @@ tasks: AUTH: "auth" MONGODB_VERSION: "%mongodbVersion%" - func: "run tests" + - name: "test-mongodb-%mongodbVersion%-standalone-ssl" tags: ["standalone", "local", "%mongodbVersion%", "ssl"] commands: @@ -36,6 +38,7 @@ tasks: TOPOLOGY: "replica_set" MONGODB_VERSION: "%mongodbVersion%" - func: "run tests" + - name: "test-mongodb-%mongodbVersion%-replicaset-auth" tags: ["replicaset", "local", "%mongodbVersion%", "auth"] commands: diff --git a/.evergreen/config/templates/test/ocsp.yml b/.evergreen/config/templates/test/ocsp.yml index dfbbc0aac..9c8226524 100644 --- a/.evergreen/config/templates/test/ocsp.yml +++ b/.evergreen/config/templates/test/ocsp.yml @@ -16,6 +16,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -33,6 +34,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -50,6 +52,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_1-ecdsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -67,6 +70,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -84,6 +88,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -101,6 +106,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_2-rsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -118,6 +124,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_2-ecdsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -135,6 +142,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -152,6 +160,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -169,6 +178,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_3-rsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -186,6 +196,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_3-ecdsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -203,6 +214,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -220,6 +232,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -237,6 +250,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_4-rsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -254,6 +268,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-test_4-ecdsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -271,6 +286,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-soft_fail_test-rsa-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -283,6 +299,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-soft_fail_test-ecdsa-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -295,6 +312,7 @@ tasks: vars: TESTS: "tests/ocsp-success.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -312,6 +330,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -329,6 +348,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -346,6 +366,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -363,6 +384,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-malicious_server_test_2-rsa-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: @@ -375,6 +397,7 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + - name: "ocsp-malicious_server_test_2-ecdsa-%mongodbVersion%" tags: ["ocsp", "%mongodbVersion%"] commands: From d529aca675bdd353dd9b8c68adbacff62ecb9815 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 9 Oct 2023 10:32:28 +0200 Subject: [PATCH 41/44] Add note about libmongoc build tasks in contributing guide --- CONTRIBUTING.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d05269440..3d726a81f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -253,9 +253,10 @@ AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.20.0) #### Update tested versions in Evergreen configuration Evergreen tests against multiple versions of libmongoc. When updating to a newer -libmongoc version, make sure to update the `libmongoc-version` build axis in -`.evergreen/config.yml`. In general, we test against two additional versions of -libmongoc: +libmongoc version, make sure to update the libmongoc build tasks in `.evergreen/config/templates/build/build-libmongoc.yml` +and regenerate the build configuration. The template file contains additional +information about the build tasks and where they are used. In general, we test +against two additional versions of libmongoc: - The upcoming patch release of the current libmongoc minor version (e.g. the `r1.x` branch) From 308bfc51e43ea09ded31e65b3cc7be3611ade796 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 11 Oct 2023 09:38:08 +0200 Subject: [PATCH 42/44] Use real server version in architecture docs --- .evergreen/architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/architecture.md b/.evergreen/architecture.md index e9391a4b6..811dbc0bb 100644 --- a/.evergreen/architecture.md +++ b/.evergreen/architecture.md @@ -53,7 +53,7 @@ Tasks are tagged to allow for a better selection in build variants. The followin Test tasks use the following tags: - `local`: All tasks that run a local MongoDB cluster for testing. -- ``: These tags allow selection based on MongoDB version, e.g. `6.4`. +- ``: These tags allow selection based on MongoDB version, e.g. `7.0`. - `standalone`, `replicaset`, `sharded`: These tags allow selection based on the MongoDB topology. - `loadbalanced`: Allows for selecting tests using a load balancer - `ocsp`: Used for all OCSP tasks From a5efc273fabc7bca82caf3ab87a93ca984fb478e Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 11 Oct 2023 09:40:35 +0200 Subject: [PATCH 43/44] Treat loadbalanced as its own topology in tests --- .evergreen/config/generated/test/load-balanced-5.0.yml | 2 +- .evergreen/config/generated/test/load-balanced-6.0.yml | 2 +- .evergreen/config/generated/test/load-balanced-7.0.yml | 2 +- .evergreen/config/generated/test/load-balanced-latest.yml | 2 +- .evergreen/config/generated/test/load-balanced-rapid.yml | 2 +- .evergreen/config/templates/test/load-balanced.yml | 2 +- .evergreen/config/test-variants.yml | 2 ++ 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.evergreen/config/generated/test/load-balanced-5.0.yml b/.evergreen/config/generated/test/load-balanced-5.0.yml index 13821fe11..8d957d383 100644 --- a/.evergreen/config/generated/test/load-balanced-5.0.yml +++ b/.evergreen/config/generated/test/load-balanced-5.0.yml @@ -1,7 +1,7 @@ # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-5.0-loadbalanced" - tags: ["sharded", "local", "5.0", "loadbalanced"] + tags: ["loadbalanced", "local", "5.0"] commands: - func: "bootstrap mongo-orchestration" vars: diff --git a/.evergreen/config/generated/test/load-balanced-6.0.yml b/.evergreen/config/generated/test/load-balanced-6.0.yml index 9da56b01e..236a5c77a 100644 --- a/.evergreen/config/generated/test/load-balanced-6.0.yml +++ b/.evergreen/config/generated/test/load-balanced-6.0.yml @@ -1,7 +1,7 @@ # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-6.0-loadbalanced" - tags: ["sharded", "local", "6.0", "loadbalanced"] + tags: ["loadbalanced", "local", "6.0"] commands: - func: "bootstrap mongo-orchestration" vars: diff --git a/.evergreen/config/generated/test/load-balanced-7.0.yml b/.evergreen/config/generated/test/load-balanced-7.0.yml index 300243e38..aa58aa552 100644 --- a/.evergreen/config/generated/test/load-balanced-7.0.yml +++ b/.evergreen/config/generated/test/load-balanced-7.0.yml @@ -1,7 +1,7 @@ # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-7.0-loadbalanced" - tags: ["sharded", "local", "7.0", "loadbalanced"] + tags: ["loadbalanced", "local", "7.0"] commands: - func: "bootstrap mongo-orchestration" vars: diff --git a/.evergreen/config/generated/test/load-balanced-latest.yml b/.evergreen/config/generated/test/load-balanced-latest.yml index 3f16d0eb6..626c85eb2 100644 --- a/.evergreen/config/generated/test/load-balanced-latest.yml +++ b/.evergreen/config/generated/test/load-balanced-latest.yml @@ -1,7 +1,7 @@ # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-latest-loadbalanced" - tags: ["sharded", "local", "latest", "loadbalanced"] + tags: ["loadbalanced", "local", "latest"] commands: - func: "bootstrap mongo-orchestration" vars: diff --git a/.evergreen/config/generated/test/load-balanced-rapid.yml b/.evergreen/config/generated/test/load-balanced-rapid.yml index 660e7417f..bae27c779 100644 --- a/.evergreen/config/generated/test/load-balanced-rapid.yml +++ b/.evergreen/config/generated/test/load-balanced-rapid.yml @@ -1,7 +1,7 @@ # This file is generated automatically - please edit the "templates/test/load-balanced.yml" template file instead. tasks: - name: "test-mongodb-rapid-loadbalanced" - tags: ["sharded", "local", "rapid", "loadbalanced"] + tags: ["loadbalanced", "local", "rapid"] commands: - func: "bootstrap mongo-orchestration" vars: diff --git a/.evergreen/config/templates/test/load-balanced.yml b/.evergreen/config/templates/test/load-balanced.yml index 7e5fe28b3..a904c1679 100644 --- a/.evergreen/config/templates/test/load-balanced.yml +++ b/.evergreen/config/templates/test/load-balanced.yml @@ -1,6 +1,6 @@ tasks: - name: "test-mongodb-%mongodbVersion%-loadbalanced" - tags: ["sharded", "local", "%mongodbVersion%", "loadbalanced"] + tags: ["loadbalanced", "local", "%mongodbVersion%"] commands: - func: "bootstrap mongo-orchestration" vars: diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml index e0668db50..c8c079143 100644 --- a/.evergreen/config/test-variants.yml +++ b/.evergreen/config/test-variants.yml @@ -17,6 +17,7 @@ buildvariants: - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - "test-atlas-connectivity" - ".ocsp !.4.4" display_tasks: @@ -50,6 +51,7 @@ buildvariants: - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" + - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - ".ocsp !.6.0 !.7.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4" From 8c0fff7b3d42ec6355aada55011aa6175cdce769 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 13 Oct 2023 08:30:57 +0200 Subject: [PATCH 44/44] Kill tasks after 10 minutes --- .evergreen/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f9441d647..e8c5572e1 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -6,10 +6,9 @@ stepback: true # Actual testing tasks are marked with `type: test` command_type: system -# Protect ourselves against rogue test case that runs forever -# Good rule of thumb: the average length a task takes, times 5, which roughly accounts for variable system performance -# for various build variants -exec_timeout_secs: 1800 +# Protect ourselves against rogue test case that runs forever. Tasks are killed after 10 minutes, which shouldn't occur +# under normal circumstances. +exec_timeout_secs: 600 # These pre and post rules apply to all tasks not part of a task group, which should only ever be tests against local # MongoDB instances. All other tasks that require special preparation should be run from within a task group