Skip to content

Commit f681a0b

Browse files
authored
PHPC-2047: Update load balancer testing config (#1300)
* PHPC-2047: Update load balancer testing config Upstream changes in drivers-evergreen-tools now require passing LOAD_BALANCER to run-orchestration.sh. Additionally, service ID mocking is no longer required as of server version 5.1. * Add missing live server checks in tests
1 parent f5b5ef2 commit f681a0b

10 files changed

+13
-4
lines changed

.evergreen/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ functions:
360360
params:
361361
script: |
362362
${PREPARE_SHELL}
363-
MONGODB_VERSION=${VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} REQUIRE_API_VERSION=${REQUIRE_API_VERSION} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
363+
MONGODB_VERSION=${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
364364
# run-orchestration generates expansion file with the MONGODB_URI for the cluster
365365
- command: expansions.update
366366
params:
@@ -611,12 +611,11 @@ tasks:
611611
- func: "bootstrap mongo-orchestration"
612612
vars:
613613
TOPOLOGY: "sharded_cluster"
614+
LOAD_BALANCER: "true"
614615
SSL: "yes"
615616
- func: "start load balancer"
616617
- func: "run tests"
617618
vars:
618-
# Testing with HAProxy requires service ID mocking
619-
MOCK_SERVICE_ID: 1
620619
# Note: loadBalanced=true should already be appended to SINGLE_MONGOS_LB_URI
621620
MONGODB_URI: "${SINGLE_MONGOS_LB_URI}"
622621
SSL: "yes"
@@ -1285,7 +1284,8 @@ buildvariants:
12851284
- name: "test-requireApiVersion"
12861285

12871286
- matrix_name: "test-loadBalanced"
1288-
matrix_spec: { "os": "debian92", "versions": ["5.0", "latest"], "php-edge-versions": "latest-stable" }
1287+
# TODO: Add "5.2" server version alongside "latest" following its GA release
1288+
matrix_spec: { "os": "debian92", "versions": "latest", "php-edge-versions": "latest-stable" }
12891289
display_name: "Load balanced - ${versions}"
12901290
tasks:
12911291
- name: "test-loadBalanced"

tests/connect/bug0720.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PHPC-720: Do not persist SSL streams to avoid SSL reinitialization errors
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
77
<?php skip_if_no_ssl_dir(); ?>
8+
<?php skip_if_not_live(); ?>
89
--FILE--
910
<?php
1011
require_once __DIR__ . "/../utils/basic.inc";

tests/connect/standalone-ssl-no_verify-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Connect to MongoDB with SSL and no host/cert verification (driver options)
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
7+
<?php skip_if_not_live(); ?>
78
--FILE--
89
<?php
910
require_once __DIR__ . "/../utils/basic.inc";

tests/connect/standalone-ssl-no_verify-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Connect to MongoDB with SSL and no host/cert verification (context options)
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
7+
<?php skip_if_not_live(); ?>
78
--FILE--
89
<?php
910
require_once __DIR__ . "/../utils/basic.inc";

tests/connect/standalone-ssl-no_verify-003.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Connect to MongoDB with SSL and no host/cert verification (URI options)
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
7+
<?php skip_if_not_live(); ?>
78
--FILE--
89
<?php
910
require_once __DIR__ . "/../utils/basic.inc";

tests/connect/standalone-ssl-verify_cert-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Connect to MongoDB with SSL and cert verification (driver options)
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
77
<?php skip_if_no_ssl_dir(); ?>
8+
<?php skip_if_not_live(); ?>
89
--FILE--
910
<?php
1011
require_once __DIR__ . "/../utils/basic.inc";

tests/connect/standalone-ssl-verify_cert-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Connect to MongoDB with SSL and cert verification (context options)
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
77
<?php skip_if_no_ssl_dir(); ?>
8+
<?php skip_if_not_live(); ?>
89
--FILE--
910
<?php
1011
require_once __DIR__ . "/../utils/basic.inc";

tests/connect/standalone-ssl-verify_cert-003.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Connect to MongoDB with SSL and cert verification (URI options)
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
77
<?php skip_if_no_ssl_dir(); ?>
8+
<?php skip_if_not_live(); ?>
89
--FILE--
910
<?php
1011
require_once __DIR__ . "/../utils/basic.inc";

tests/manager/bug0572.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ PHPC-572: Ensure stream context does not go out of scope before socket init
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
7+
<?php skip_if_not_live(); ?>
78
--FILE--
89
<?php
910
require_once __DIR__ . "/../utils/basic.inc";

tests/manager/manager-set-uri-options-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MongoDB\Driver\Manager: Connecting to MongoDB using "ssl" from $options
44
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
55
<?php skip_if_not_libmongoc_ssl(); ?>
66
<?php skip_if_not_ssl(); ?>
7+
<?php skip_if_not_live(); ?>
78
--FILE--
89
<?php
910
require_once __DIR__ . "/../utils/basic.inc";

0 commit comments

Comments
 (0)