From 68a215b0a9fb13b05260e7d42fa798a78db43591 Mon Sep 17 00:00:00 2001 From: DmitryLukyanov Date: Wed, 30 Nov 2022 03:40:29 +0400 Subject: [PATCH 1/3] CSHARP-4355: Test crypt_shared with older server versions. --- evergreen/evergreen.yml | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index 2e3b77bfa00..82ea6ce64b5 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -114,7 +114,7 @@ functions: # 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 + git clone https://github.com/DmitryLukyanov/drivers-evergreen-tools.git --branch D2465 $DRIVERS_TOOLS fi echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config @@ -229,6 +229,7 @@ functions: SSL=${SSL} \ STORAGE_ENGINE=${STORAGE_ENGINE} \ ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \ + FORCE_CONFIGURE_SHARED_VERSION=${FORCE_CONFIGURE_SHARED_VERSION} \ sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh # run-orchestration generates expansion file with the MONGODB_URI for the cluster - command: expansions.update @@ -1048,6 +1049,8 @@ tasks: - func: start-kms-mock-gcp-server - func: start-kms-mock-azure-imds-server - func: bootstrap-mongo-orchestration + vars: + FORCE_CONFIGURE_SHARED_VERSION: "YES" - func: run-csfle-with-mocked-kms-tests vars: FRAMEWORK: net472 @@ -1059,6 +1062,8 @@ tasks: - func: start-kms-mock-gcp-server - func: start-kms-mock-azure-imds-server - func: bootstrap-mongo-orchestration + vars: + FORCE_CONFIGURE_SHARED_VERSION: "YES" - func: run-csfle-with-mocked-kms-tests vars: FRAMEWORK: netstandard20 @@ -1070,6 +1075,8 @@ tasks: - func: start-kms-mock-gcp-server - func: start-kms-mock-azure-imds-server - func: bootstrap-mongo-orchestration + vars: + FORCE_CONFIGURE_SHARED_VERSION: "YES" - func: run-csfle-with-mocked-kms-tests vars: FRAMEWORK: netstandard21 @@ -2063,45 +2070,30 @@ buildvariants: - name: test-gssapi-netstandard21 - matrix_name: "csfle-with-mocked-kms-tests-windows" - matrix_spec: { os: "windows-64", ssl: "nossl", version: [ "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] } + matrix_spec: { os: "windows-64", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] } display_name: "CSFLE Mocked KMS ${version} ${os}" tasks: - name: test-csfle-with-mocked-kms-tls-net472 - name: test-csfle-with-mocked-kms-tls-netstandard20 - name: test-csfle-with-mocked-kms-tls-netstandard21 + - name: test-csfle-with-mongocryptd-net472 + - name: test-csfle-with-mongocryptd-netstandard20 + - name: test-csfle-with-mongocryptd-netstandard21 - matrix_name: "csfle-with-mocked-kms-tests-linux" - matrix_spec: { os: "ubuntu-1804", ssl: "nossl", version: [ "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] } + matrix_spec: { os: "ubuntu-1804", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] } display_name: "CSFLE Mocked KMS ${version} ${os}" tasks: - name: test-csfle-with-mocked-kms-tls-netstandard20 - name: test-csfle-with-mocked-kms-tls-netstandard21 + - name: test-csfle-with-mongocryptd-netstandard20 + - name: test-csfle-with-mongocryptd-netstandard21 - matrix_name: "csfle-with-mocked-kms-tests-macOS" - matrix_spec: { os: [ "macos-1100", "macos-1100-arm64" ], ssl: "nossl", version: [ "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] } + matrix_spec: { os: [ "macos-1100", "macos-1100-arm64" ], ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "rapid", "latest" ], topology: ["replicaset"] } display_name: "CSFLE Mocked KMS ${version} ${os}" tasks: - name: test-csfle-with-mocked-kms-tls-netstandard21 - -- matrix_name: "csfle-with-mongocryptd-windows" - matrix_spec: { os: "windows-64", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "latest" ], topology: ["replicaset"] } - display_name: "CSFLE with mongocryptd ${version} ${os}" - tasks: - - name: test-csfle-with-mongocryptd-net472 - - name: test-csfle-with-mongocryptd-netstandard20 - - name: test-csfle-with-mongocryptd-netstandard21 - -- matrix_name: "csfle-with-mongocryptd-linux" - matrix_spec: { os: "ubuntu-1804", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "latest" ], topology: ["replicaset"] } - display_name: "CSFLE with mongocryptd ${version} ${os}" - tasks: - - name: test-csfle-with-mongocryptd-netstandard20 - - name: test-csfle-with-mongocryptd-netstandard21 - -- matrix_name: "csfle-with-mongocryptd-macOS" - matrix_spec: { os: ["macos-1100", "macos-1100-arm64"], ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "latest" ], topology: ["replicaset"] } - display_name: "CSFLE with mongocryptd ${version} ${os}" - tasks: - name: test-csfle-with-mongocryptd-netstandard21 - matrix_name: "csfle-with-azure-kms-tests-linux" From 1772f0c1b1630c45b0d28ce027ef5821c2f96dae Mon Sep 17 00:00:00 2001 From: DmitryLukyanov Date: Mon, 19 Dec 2022 19:36:46 +0400 Subject: [PATCH 2/3] Simplification. --- evergreen/evergreen.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index 82ea6ce64b5..5ef8cb58802 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -114,7 +114,7 @@ functions: # 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/DmitryLukyanov/drivers-evergreen-tools.git --branch D2465 $DRIVERS_TOOLS + git clone https://github.com/kevinAlbs/drivers-evergreen-tools.git --branch D2465 $DRIVERS_TOOLS fi echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config @@ -229,7 +229,6 @@ functions: SSL=${SSL} \ STORAGE_ENGINE=${STORAGE_ENGINE} \ ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \ - FORCE_CONFIGURE_SHARED_VERSION=${FORCE_CONFIGURE_SHARED_VERSION} \ sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh # run-orchestration generates expansion file with the MONGODB_URI for the cluster - command: expansions.update @@ -1049,8 +1048,6 @@ tasks: - func: start-kms-mock-gcp-server - func: start-kms-mock-azure-imds-server - func: bootstrap-mongo-orchestration - vars: - FORCE_CONFIGURE_SHARED_VERSION: "YES" - func: run-csfle-with-mocked-kms-tests vars: FRAMEWORK: net472 @@ -1062,8 +1059,6 @@ tasks: - func: start-kms-mock-gcp-server - func: start-kms-mock-azure-imds-server - func: bootstrap-mongo-orchestration - vars: - FORCE_CONFIGURE_SHARED_VERSION: "YES" - func: run-csfle-with-mocked-kms-tests vars: FRAMEWORK: netstandard20 @@ -1075,8 +1070,6 @@ tasks: - func: start-kms-mock-gcp-server - func: start-kms-mock-azure-imds-server - func: bootstrap-mongo-orchestration - vars: - FORCE_CONFIGURE_SHARED_VERSION: "YES" - func: run-csfle-with-mocked-kms-tests vars: FRAMEWORK: netstandard21 From 1d4062a325b464e8e5cb456182c0a542376d4b01 Mon Sep 17 00:00:00 2001 From: DmitryLukyanov Date: Tue, 20 Dec 2022 01:21:09 +0400 Subject: [PATCH 3/3] Remove temp link. --- evergreen/evergreen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index 5ef8cb58802..3cace6ccfa5 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -114,7 +114,7 @@ functions: # 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/kevinAlbs/drivers-evergreen-tools.git --branch D2465 $DRIVERS_TOOLS + git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS fi echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config