From a237ffa83c4c187bea044054c4b708d7849c2361 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Thu, 17 Oct 2024 08:49:27 +0200 Subject: [PATCH 1/2] Skip building against libmongoc master --- .evergreen/config/build-task-groups.yml | 2 +- .../generated/build/build-libmongoc.yml | 18 +++--- .../generated/test-variant/libmongoc.yml | 60 +++++++++---------- .../templates/build/build-libmongoc.yml | 18 +++--- .../templates/test-variant/libmongoc.yml | 60 +++++++++---------- 5 files changed, 81 insertions(+), 77 deletions(-) diff --git a/.evergreen/config/build-task-groups.yml b/.evergreen/config/build-task-groups.yml index eca9e5f1b..985a78d0c 100644 --- a/.evergreen/config/build-task-groups.yml +++ b/.evergreen/config/build-task-groups.yml @@ -44,7 +44,7 @@ task_groups: - name: "build-php-libmongoc" # Keep this in sync with the actual number of libmongoc builds (typically 3) defined in _template-build-libmongoc.yml - max_hosts: 3 + max_hosts: 2 setup_task: *build_setup setup_task_can_fail_task: true setup_task_timeout_secs: 1800 diff --git a/.evergreen/config/generated/build/build-libmongoc.yml b/.evergreen/config/generated/build/build-libmongoc.yml index 5338fd4c3..942a73d10 100644 --- a/.evergreen/config/generated/build/build-libmongoc.yml +++ b/.evergreen/config/generated/build/build-libmongoc.yml @@ -24,11 +24,13 @@ tasks: LIBMONGOC_VERSION: "r1.28" - func: "upload build" - - name: "build-php-8.3-libmongoc-latest" - tags: ["build-libmongoc", "php8.3"] - commands: - - func: "compile driver" - vars: - PHP_VERSION: "8.3" - LIBMONGOC_VERSION: "master" - - func: "upload build" +# TODO: this currently fails as libmongoc master needs changes to build directories +# We can re-enable this after switching to 1.29-dev +# - name: "build-php-8.3-libmongoc-latest" +# tags: ["build-libmongoc", "php8.3"] +# commands: +# - func: "compile driver" +# vars: +# PHP_VERSION: "8.3" +# LIBMONGOC_VERSION: "master" +# - func: "upload build" diff --git a/.evergreen/config/generated/test-variant/libmongoc.yml b/.evergreen/config/generated/test-variant/libmongoc.yml index 85b41e617..c7c9db90a 100644 --- a/.evergreen/config/generated/test-variant/libmongoc.yml +++ b/.evergreen/config/generated/test-variant/libmongoc.yml @@ -63,33 +63,33 @@ buildvariants: execution_tasks: - ".ocsp .7.0" - - name: test-debian12-php-8.3-libmongoc-latest - tags: ["test", "libmongoc", "debian", "x64", "php8.3"] - display_name: "Test: Debian 12, PHP 8.3, libmongoc latest" - run_on: debian12-small - expansions: - FETCH_BUILD_VARIANT: "build-debian12" - FETCH_BUILD_TASK: "build-php-8.3-libmongoc-latest" - depends_on: - - variant: "build-debian12" - name: "build-php-8.3-libmongoc-latest" - tasks: - - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0 !.6.0" - display_tasks: - - name: "test-ocsp-latest" - execution_tasks: - - ".ocsp .latest" - - name: "test-ocsp-rapid" - execution_tasks: - - ".ocsp .rapid" - - name: "test-ocsp-8.0" - execution_tasks: - - ".ocsp .8.0" - - name: "test-ocsp-7.0" - execution_tasks: - - ".ocsp .7.0" +# - name: test-debian12-php-8.3-libmongoc-latest +# tags: ["test", "libmongoc", "debian", "x64", "php8.3"] +# display_name: "Test: Debian 12, PHP 8.3, libmongoc latest" +# run_on: debian12-small +# expansions: +# FETCH_BUILD_VARIANT: "build-debian12" +# FETCH_BUILD_TASK: "build-php-8.3-libmongoc-latest" +# depends_on: +# - variant: "build-debian12" +# name: "build-php-8.3-libmongoc-latest" +# tasks: +# - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" +# - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" +# - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" +# - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" +# - "test-atlas-connectivity" +# - ".ocsp !.4.4 !.5.0 !.6.0" +# display_tasks: +# - name: "test-ocsp-latest" +# execution_tasks: +# - ".ocsp .latest" +# - name: "test-ocsp-rapid" +# execution_tasks: +# - ".ocsp .rapid" +# - name: "test-ocsp-8.0" +# execution_tasks: +# - ".ocsp .8.0" +# - name: "test-ocsp-7.0" +# execution_tasks: +# - ".ocsp .7.0" diff --git a/.evergreen/config/templates/build/build-libmongoc.yml b/.evergreen/config/templates/build/build-libmongoc.yml index 19c6963ea..366cb20fe 100644 --- a/.evergreen/config/templates/build/build-libmongoc.yml +++ b/.evergreen/config/templates/build/build-libmongoc.yml @@ -22,11 +22,13 @@ LIBMONGOC_VERSION: "r1.28" - 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" +# TODO: this currently fails as libmongoc master needs changes to build directories +# We can re-enable this after switching to 1.29-dev +# - 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/templates/test-variant/libmongoc.yml b/.evergreen/config/templates/test-variant/libmongoc.yml index 90099c6bf..e84365ca0 100644 --- a/.evergreen/config/templates/test-variant/libmongoc.yml +++ b/.evergreen/config/templates/test-variant/libmongoc.yml @@ -61,33 +61,33 @@ execution_tasks: - ".ocsp .7.0" - - name: test-debian12-php-%phpVersion%-libmongoc-latest - tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%"] - display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc latest" - run_on: debian12-small - expansions: - FETCH_BUILD_VARIANT: "build-debian12" - FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-latest" - depends_on: - - variant: "build-debian12" - name: "build-php-%phpVersion%-libmongoc-latest" - tasks: - - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0 !.6.0" - display_tasks: - - name: "test-ocsp-latest" - execution_tasks: - - ".ocsp .latest" - - name: "test-ocsp-rapid" - execution_tasks: - - ".ocsp .rapid" - - name: "test-ocsp-8.0" - execution_tasks: - - ".ocsp .8.0" - - name: "test-ocsp-7.0" - execution_tasks: - - ".ocsp .7.0" +# - name: test-debian12-php-%phpVersion%-libmongoc-latest +# tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%"] +# display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc latest" +# run_on: debian12-small +# expansions: +# FETCH_BUILD_VARIANT: "build-debian12" +# FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-latest" +# depends_on: +# - variant: "build-debian12" +# name: "build-php-%phpVersion%-libmongoc-latest" +# tasks: +# - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" +# - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" +# - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" +# - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" +# - "test-atlas-connectivity" +# - ".ocsp !.4.4 !.5.0 !.6.0" +# display_tasks: +# - name: "test-ocsp-latest" +# execution_tasks: +# - ".ocsp .latest" +# - name: "test-ocsp-rapid" +# execution_tasks: +# - ".ocsp .rapid" +# - name: "test-ocsp-8.0" +# execution_tasks: +# - ".ocsp .8.0" +# - name: "test-ocsp-7.0" +# execution_tasks: +# - ".ocsp .7.0" From 3b35a078e9fe7a8b63a24a1b58770db822441172 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Thu, 17 Oct 2024 08:55:06 +0200 Subject: [PATCH 2/2] Remove unmatched task selector --- .evergreen/config/generated/test-variant/legacy-php-full.yml | 2 -- .evergreen/config/generated/test-variant/modern-php-full.yml | 4 ---- .evergreen/config/templates/test-variant/legacy-php-full.yml | 1 - .evergreen/config/templates/test-variant/modern-php-full.yml | 1 - 4 files changed, 8 deletions(-) diff --git a/.evergreen/config/generated/test-variant/legacy-php-full.yml b/.evergreen/config/generated/test-variant/legacy-php-full.yml index 5c49b3b31..eda6b2a05 100644 --- a/.evergreen/config/generated/test-variant/legacy-php-full.yml +++ b/.evergreen/config/generated/test-variant/legacy-php-full.yml @@ -53,7 +53,6 @@ buildvariants: - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4" @@ -112,7 +111,6 @@ buildvariants: - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4" diff --git a/.evergreen/config/generated/test-variant/modern-php-full.yml b/.evergreen/config/generated/test-variant/modern-php-full.yml index 72e7cda2e..00f9a7f23 100644 --- a/.evergreen/config/generated/test-variant/modern-php-full.yml +++ b/.evergreen/config/generated/test-variant/modern-php-full.yml @@ -74,7 +74,6 @@ buildvariants: - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4" @@ -154,7 +153,6 @@ buildvariants: - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4" @@ -234,7 +232,6 @@ buildvariants: - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4" @@ -314,7 +311,6 @@ buildvariants: - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4" diff --git a/.evergreen/config/templates/test-variant/legacy-php-full.yml b/.evergreen/config/templates/test-variant/legacy-php-full.yml index 8722da03e..420d4184e 100644 --- a/.evergreen/config/templates/test-variant/legacy-php-full.yml +++ b/.evergreen/config/templates/test-variant/legacy-php-full.yml @@ -51,7 +51,6 @@ - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4" diff --git a/.evergreen/config/templates/test-variant/modern-php-full.yml b/.evergreen/config/templates/test-variant/modern-php-full.yml index cba0d8412..e12cd97dc 100644 --- a/.evergreen/config/templates/test-variant/modern-php-full.yml +++ b/.evergreen/config/templates/test-variant/modern-php-full.yml @@ -72,7 +72,6 @@ - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - name: "test-ocsp-4.4"