From 17979e40b7cfcfa9e3f322d9fb1c5dc911a4dd31 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 27 Sep 2024 15:59:36 +0200 Subject: [PATCH] Use RHEL 8 to test old server versions (#1700) --- .evergreen/config/build-variants.yml | 12 ------- .../test-variant/legacy-php-full.yml | 24 ++++++------- .../test-variant/modern-php-full.yml | 36 +++++++++---------- .../test-variant/legacy-php-full.yml | 12 +++---- .../test-variant/modern-php-full.yml | 12 +++---- 5 files changed, 42 insertions(+), 54 deletions(-) diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml index 2ebc36127..20f6528be 100644 --- a/.evergreen/config/build-variants.yml +++ b/.evergreen/config/build-variants.yml @@ -16,18 +16,6 @@ buildvariants: run_on: debian11-small tasks: - name: "build-all-php" - - name: build-debian10 - display_name: "Build: Debian 10" - tags: ["build", "debian", "x64", "pr", "tag"] - run_on: debian10-small - tasks: - - name: "build-all-php" - - name: build-debian92 - display_name: "Build: Debian 9.2" - tags: ["build", "debian", "x64", "pr", "tag"] - run_on: debian92-small - tasks: - - name: "build-all-php" # RHEL - name: build-rhel90 diff --git a/.evergreen/config/generated/test-variant/legacy-php-full.yml b/.evergreen/config/generated/test-variant/legacy-php-full.yml index c4812e39b..5c49b3b31 100644 --- a/.evergreen/config/generated/test-variant/legacy-php-full.yml +++ b/.evergreen/config/generated/test-variant/legacy-php-full.yml @@ -38,15 +38,15 @@ buildvariants: - ".ocsp .5.0" # Test versions < 5.0 - - name: test-debian92-php-8.0 - tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.0" - run_on: debian92-small + - name: test-rhel80-php-8.0 + tags: ["test", "rhel", "x64", "php8.0", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP 8.0" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel8" FETCH_BUILD_TASK: "build-php-8.0" depends_on: - - variant: "build-debian92" + - variant: "build-rhel8" name: "build-php-8.0" tasks: # Remember to add new major versions here as they are released @@ -97,15 +97,15 @@ buildvariants: - ".ocsp .5.0" # Test versions < 5.0 - - name: test-debian92-php-7.4 - tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 7.4" - run_on: debian92-small + - name: test-rhel80-php-7.4 + tags: ["test", "rhel", "x64", "php7.4", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP 7.4" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel8" FETCH_BUILD_TASK: "build-php-7.4" depends_on: - - variant: "build-debian92" + - variant: "build-rhel8" name: "build-php-7.4" tasks: # Remember to add new major versions here as they are released diff --git a/.evergreen/config/generated/test-variant/modern-php-full.yml b/.evergreen/config/generated/test-variant/modern-php-full.yml index 8ee3d8be1..34604e61e 100644 --- a/.evergreen/config/generated/test-variant/modern-php-full.yml +++ b/.evergreen/config/generated/test-variant/modern-php-full.yml @@ -59,15 +59,15 @@ buildvariants: - ".ocsp .5.0" # Test versions < 5.0 - - name: test-debian92-php-8.3 - tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.3" - run_on: debian92-small + - name: test-rhel80-php-8.3 + tags: ["test", "rhel", "x64", "php8.3", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP 8.3" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel8" FETCH_BUILD_TASK: "build-php-8.3" depends_on: - - variant: "build-debian92" + - variant: "build-rhel8" name: "build-php-8.3" tasks: # Remember to add new major versions here as they are released @@ -139,15 +139,15 @@ buildvariants: - ".ocsp .5.0" # Test versions < 5.0 - - name: test-debian92-php-8.2 - tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.2" - run_on: debian92-small + - name: test-rhel80-php-8.2 + tags: ["test", "rhel", "x64", "php8.2", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP 8.2" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel8" FETCH_BUILD_TASK: "build-php-8.2" depends_on: - - variant: "build-debian92" + - variant: "build-rhel8" name: "build-php-8.2" tasks: # Remember to add new major versions here as they are released @@ -219,15 +219,15 @@ buildvariants: - ".ocsp .5.0" # Test versions < 5.0 - - name: test-debian92-php-8.1 - tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.1" - run_on: debian92-small + - name: test-rhel80-php-8.1 + tags: ["test", "rhel", "x64", "php8.1", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP 8.1" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel8" FETCH_BUILD_TASK: "build-php-8.1" depends_on: - - variant: "build-debian92" + - variant: "build-rhel8" name: "build-php-8.1" tasks: # Remember to add new major versions here as they are released diff --git a/.evergreen/config/templates/test-variant/legacy-php-full.yml b/.evergreen/config/templates/test-variant/legacy-php-full.yml index 4fa23f7db..8722da03e 100644 --- a/.evergreen/config/templates/test-variant/legacy-php-full.yml +++ b/.evergreen/config/templates/test-variant/legacy-php-full.yml @@ -36,15 +36,15 @@ - ".ocsp .5.0" # Test versions < 5.0 - - name: test-debian92-php-%phpVersion% - tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP %phpVersion%" - run_on: debian92-small + - name: test-rhel80-php-%phpVersion% + tags: ["test", "rhel", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP %phpVersion%" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel8" FETCH_BUILD_TASK: "build-php-%phpVersion%" depends_on: - - variant: "build-debian92" + - variant: "build-rhel8" name: "build-php-%phpVersion%" tasks: # Remember to add new major versions here as they are released diff --git a/.evergreen/config/templates/test-variant/modern-php-full.yml b/.evergreen/config/templates/test-variant/modern-php-full.yml index 8d925f5cf..cba0d8412 100644 --- a/.evergreen/config/templates/test-variant/modern-php-full.yml +++ b/.evergreen/config/templates/test-variant/modern-php-full.yml @@ -57,15 +57,15 @@ - ".ocsp .5.0" # Test versions < 5.0 - - name: test-debian92-php-%phpVersion% - tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP %phpVersion%" - run_on: debian92-small + - name: test-rhel80-php-%phpVersion% + tags: ["test", "rhel", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP %phpVersion%" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel8" FETCH_BUILD_TASK: "build-php-%phpVersion%" depends_on: - - variant: "build-debian92" + - variant: "build-rhel8" name: "build-php-%phpVersion%" tasks: # Remember to add new major versions here as they are released