Skip to content

Commit 694fbf3

Browse files
eramongodberamongodb
authored
CDRIVER-6071 fix prohibition of OCSP TEST_3 with darwinssl (#2086)
1 parent 1f756d6 commit 694fbf3

File tree

2 files changed

+1
-281
lines changed

2 files changed

+1
-281
lines changed

‎.evergreen/generated_configs/legacy-config.yml

Lines changed: 0 additions & 280 deletions
Original file line numberDiff line numberDiff line change
@@ -4051,146 +4051,6 @@ tasks:
40514051
set -o errexit
40524052
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
40534053
patchable: false
4054-
- name: ocsp-darwinssl-test_3-rsa-delegate-latest
4055-
tags:
4056-
- ocsp-darwinssl
4057-
depends_on:
4058-
name: debug-compile-nosasl-darwinssl
4059-
commands:
4060-
- func: fetch-build
4061-
vars:
4062-
BUILD_NAME: debug-compile-nosasl-darwinssl
4063-
- func: fetch-det
4064-
- command: shell.exec
4065-
type: test
4066-
params:
4067-
working_dir: mongoc
4068-
shell: bash
4069-
script: |-
4070-
set -o errexit
4071-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa USE_DELEGATE=ON .evergreen/scripts/run-ocsp-responder.sh
4072-
- func: bootstrap-mongo-orchestration
4073-
vars:
4074-
MONGODB_VERSION: latest
4075-
OCSP: 'on'
4076-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
4077-
SSL: ssl
4078-
TOPOLOGY: server
4079-
- command: shell.exec
4080-
type: test
4081-
params:
4082-
working_dir: mongoc
4083-
redirect_standard_error_to_output: true
4084-
shell: bash
4085-
script: |-
4086-
set -o errexit
4087-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
4088-
patchable: false
4089-
- name: ocsp-darwinssl-test_3-rsa-delegate-8.0
4090-
tags:
4091-
- ocsp-darwinssl
4092-
depends_on:
4093-
name: debug-compile-nosasl-darwinssl
4094-
commands:
4095-
- func: fetch-build
4096-
vars:
4097-
BUILD_NAME: debug-compile-nosasl-darwinssl
4098-
- func: fetch-det
4099-
- command: shell.exec
4100-
type: test
4101-
params:
4102-
working_dir: mongoc
4103-
shell: bash
4104-
script: |-
4105-
set -o errexit
4106-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa USE_DELEGATE=ON .evergreen/scripts/run-ocsp-responder.sh
4107-
- func: bootstrap-mongo-orchestration
4108-
vars:
4109-
MONGODB_VERSION: '8.0'
4110-
OCSP: 'on'
4111-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
4112-
SSL: ssl
4113-
TOPOLOGY: server
4114-
- command: shell.exec
4115-
type: test
4116-
params:
4117-
working_dir: mongoc
4118-
redirect_standard_error_to_output: true
4119-
shell: bash
4120-
script: |-
4121-
set -o errexit
4122-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
4123-
patchable: false
4124-
- name: ocsp-darwinssl-test_3-rsa-delegate-7.0
4125-
tags:
4126-
- ocsp-darwinssl
4127-
depends_on:
4128-
name: debug-compile-nosasl-darwinssl
4129-
commands:
4130-
- func: fetch-build
4131-
vars:
4132-
BUILD_NAME: debug-compile-nosasl-darwinssl
4133-
- func: fetch-det
4134-
- command: shell.exec
4135-
type: test
4136-
params:
4137-
working_dir: mongoc
4138-
shell: bash
4139-
script: |-
4140-
set -o errexit
4141-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa USE_DELEGATE=ON .evergreen/scripts/run-ocsp-responder.sh
4142-
- func: bootstrap-mongo-orchestration
4143-
vars:
4144-
MONGODB_VERSION: '7.0'
4145-
OCSP: 'on'
4146-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
4147-
SSL: ssl
4148-
TOPOLOGY: server
4149-
- command: shell.exec
4150-
type: test
4151-
params:
4152-
working_dir: mongoc
4153-
redirect_standard_error_to_output: true
4154-
shell: bash
4155-
script: |-
4156-
set -o errexit
4157-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
4158-
patchable: false
4159-
- name: ocsp-darwinssl-test_3-rsa-delegate-6.0
4160-
tags:
4161-
- ocsp-darwinssl
4162-
depends_on:
4163-
name: debug-compile-nosasl-darwinssl
4164-
commands:
4165-
- func: fetch-build
4166-
vars:
4167-
BUILD_NAME: debug-compile-nosasl-darwinssl
4168-
- func: fetch-det
4169-
- command: shell.exec
4170-
type: test
4171-
params:
4172-
working_dir: mongoc
4173-
shell: bash
4174-
script: |-
4175-
set -o errexit
4176-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa USE_DELEGATE=ON .evergreen/scripts/run-ocsp-responder.sh
4177-
- func: bootstrap-mongo-orchestration
4178-
vars:
4179-
MONGODB_VERSION: '6.0'
4180-
OCSP: 'on'
4181-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
4182-
SSL: ssl
4183-
TOPOLOGY: server
4184-
- command: shell.exec
4185-
type: test
4186-
params:
4187-
working_dir: mongoc
4188-
redirect_standard_error_to_output: true
4189-
shell: bash
4190-
script: |-
4191-
set -o errexit
4192-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
4193-
patchable: false
41944054
- name: ocsp-winssl-test_3-rsa-delegate-latest
41954055
tags:
41964056
- ocsp-winssl
@@ -4821,146 +4681,6 @@ tasks:
48214681
set -o errexit
48224682
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
48234683
patchable: false
4824-
- name: ocsp-darwinssl-test_3-rsa-nodelegate-latest
4825-
tags:
4826-
- ocsp-darwinssl
4827-
depends_on:
4828-
name: debug-compile-nosasl-darwinssl
4829-
commands:
4830-
- func: fetch-build
4831-
vars:
4832-
BUILD_NAME: debug-compile-nosasl-darwinssl
4833-
- func: fetch-det
4834-
- command: shell.exec
4835-
type: test
4836-
params:
4837-
working_dir: mongoc
4838-
shell: bash
4839-
script: |-
4840-
set -o errexit
4841-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa USE_DELEGATE=OFF .evergreen/scripts/run-ocsp-responder.sh
4842-
- func: bootstrap-mongo-orchestration
4843-
vars:
4844-
MONGODB_VERSION: latest
4845-
OCSP: 'on'
4846-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
4847-
SSL: ssl
4848-
TOPOLOGY: server
4849-
- command: shell.exec
4850-
type: test
4851-
params:
4852-
working_dir: mongoc
4853-
redirect_standard_error_to_output: true
4854-
shell: bash
4855-
script: |-
4856-
set -o errexit
4857-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
4858-
patchable: false
4859-
- name: ocsp-darwinssl-test_3-rsa-nodelegate-8.0
4860-
tags:
4861-
- ocsp-darwinssl
4862-
depends_on:
4863-
name: debug-compile-nosasl-darwinssl
4864-
commands:
4865-
- func: fetch-build
4866-
vars:
4867-
BUILD_NAME: debug-compile-nosasl-darwinssl
4868-
- func: fetch-det
4869-
- command: shell.exec
4870-
type: test
4871-
params:
4872-
working_dir: mongoc
4873-
shell: bash
4874-
script: |-
4875-
set -o errexit
4876-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa USE_DELEGATE=OFF .evergreen/scripts/run-ocsp-responder.sh
4877-
- func: bootstrap-mongo-orchestration
4878-
vars:
4879-
MONGODB_VERSION: '8.0'
4880-
OCSP: 'on'
4881-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
4882-
SSL: ssl
4883-
TOPOLOGY: server
4884-
- command: shell.exec
4885-
type: test
4886-
params:
4887-
working_dir: mongoc
4888-
redirect_standard_error_to_output: true
4889-
shell: bash
4890-
script: |-
4891-
set -o errexit
4892-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
4893-
patchable: false
4894-
- name: ocsp-darwinssl-test_3-rsa-nodelegate-7.0
4895-
tags:
4896-
- ocsp-darwinssl
4897-
depends_on:
4898-
name: debug-compile-nosasl-darwinssl
4899-
commands:
4900-
- func: fetch-build
4901-
vars:
4902-
BUILD_NAME: debug-compile-nosasl-darwinssl
4903-
- func: fetch-det
4904-
- command: shell.exec
4905-
type: test
4906-
params:
4907-
working_dir: mongoc
4908-
shell: bash
4909-
script: |-
4910-
set -o errexit
4911-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa USE_DELEGATE=OFF .evergreen/scripts/run-ocsp-responder.sh
4912-
- func: bootstrap-mongo-orchestration
4913-
vars:
4914-
MONGODB_VERSION: '7.0'
4915-
OCSP: 'on'
4916-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
4917-
SSL: ssl
4918-
TOPOLOGY: server
4919-
- command: shell.exec
4920-
type: test
4921-
params:
4922-
working_dir: mongoc
4923-
redirect_standard_error_to_output: true
4924-
shell: bash
4925-
script: |-
4926-
set -o errexit
4927-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
4928-
patchable: false
4929-
- name: ocsp-darwinssl-test_3-rsa-nodelegate-6.0
4930-
tags:
4931-
- ocsp-darwinssl
4932-
depends_on:
4933-
name: debug-compile-nosasl-darwinssl
4934-
commands:
4935-
- func: fetch-build
4936-
vars:
4937-
BUILD_NAME: debug-compile-nosasl-darwinssl
4938-
- func: fetch-det
4939-
- command: shell.exec
4940-
type: test
4941-
params:
4942-
working_dir: mongoc
4943-
shell: bash
4944-
script: |-
4945-
set -o errexit
4946-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa USE_DELEGATE=OFF .evergreen/scripts/run-ocsp-responder.sh
4947-
- func: bootstrap-mongo-orchestration
4948-
vars:
4949-
MONGODB_VERSION: '6.0'
4950-
OCSP: 'on'
4951-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
4952-
SSL: ssl
4953-
TOPOLOGY: server
4954-
- command: shell.exec
4955-
type: test
4956-
params:
4957-
working_dir: mongoc
4958-
redirect_standard_error_to_output: true
4959-
shell: bash
4960-
script: |-
4961-
set -o errexit
4962-
TEST_COLUMN=TEST_3 CERT_TYPE=rsa .evergreen/scripts/run-ocsp-test.sh
4963-
patchable: false
49644684
- name: ocsp-winssl-test_3-rsa-nodelegate-latest
49654685
tags:
49664686
- ocsp-winssl

‎.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ def do_is_valid_combination(self) -> bool:
868868
prohibit(self.test == "malicious_server_test_2")
869869

870870
# Why does this fail with Secure Transport (CSSMERR_TP_CERT_SUSPENDED)...?
871-
prohibit(self.test == "TEST_3")
871+
prohibit(self.test == "test_3")
872872

873873
# CDRIVER-3759: Secure Transport does not implement soft failure?
874874
prohibit(self.test == "soft_fail_test")

0 commit comments

Comments
 (0)