From b9c53a90c093a8fd8544c8c91726caa8a808c991 Mon Sep 17 00:00:00 2001
From: Erica Portnoy <erica@eff.org>
Date: Wed, 29 Apr 2026 12:30:20 -0700
Subject: [PATCH] move extended test image name to env so it doesn't need to be
 listed every time in the matrix

---
 .github/workflows/extended_tests_jobs.yml | 59 ++++++++++++-----------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/extended_tests_jobs.yml b/.github/workflows/extended_tests_jobs.yml
index 4448699eb..83748e73f 100644
--- a/.github/workflows/extended_tests_jobs.yml
+++ b/.github/workflows/extended_tests_jobs.yml
@@ -9,40 +9,41 @@ jobs:
     name: '-' # Makes results viewing cleaner
     strategy:
       fail-fast: false
+      env:
+        IMAGE_NAME: ubuntu-22.04
       matrix:
         PYTHON_VERSION: ['3.14']
-        IMAGE_NAME: ['ubuntu-22.04']
         TOXENV:
-        - isolated-acme,isolated-certbot,isolated-apache,isolated-cloudflare,isolated-digitalocean,isolated-dnsimple,isolated-dnsmadeeasy,isolated-gehirn,isolated-google,isolated-linode,isolated-luadns,isolated-nsone,isolated-ovh,isolated-rfc2136,isolated-route53,isolated-sakuracloud,isolated-nginx
-        - nginx_compat
-        - modification
+          - isolated-acme,isolated-certbot,isolated-apache,isolated-cloudflare,isolated-digitalocean,isolated-dnsimple,isolated-dnsmadeeasy,isolated-gehirn,isolated-google,isolated-linode,isolated-luadns,isolated-nsone,isolated-ovh,isolated-rfc2136,isolated-route53,isolated-sakuracloud,isolated-nginx
+          - nginx_compat
+          - modification
         include:
-        - PYTHON_VERSION: '3.11'
-          TOXENV: py311
-        - PYTHON_VERSION: '3.12'
-          TOXENV: py312
-        - PYTHON_VERSION: '3.13'
-          TOXENV: py313
-        - PYTHON_VERSION: '3.10'
-          TOXENV: integration-certbot-oldest
-        - PYTHON_VERSION: '3.10'
-          TOXENV: integration-nginx-oldest
-        - PYTHON_VERSION: '3.10'
-          TOXENV: integration
-        - PYTHON_VERSION: '3.11'
-          TOXENV: integration
-        - PYTHON_VERSION: '3.12'
-          TOXENV: integration
-        - PYTHON_VERSION: '3.13'
-          TOXENV: integration
-        # python 3.14 integration tests are not run here because they're run as
-        # part of the standard test suite
-        - PYTHON_VERSION: '3.12'
-          TOXENV: integration-dns-rfc2136
-        - PYTHON_VERSION: '3.12'
-          TOXENV: test-farm-apache2
+          - PYTHON_VERSION: '3.11'
+            TOXENV: py311
+          - PYTHON_VERSION: '3.12'
+            TOXENV: py312
+          - PYTHON_VERSION: '3.13'
+            TOXENV: py313
+          - PYTHON_VERSION: '3.10'
+            TOXENV: integration-certbot-oldest
+          - PYTHON_VERSION: '3.10'
+            TOXENV: integration-nginx-oldest
+          - PYTHON_VERSION: '3.10'
+            TOXENV: integration
+          - PYTHON_VERSION: '3.11'
+            TOXENV: integration
+          - PYTHON_VERSION: '3.12'
+            TOXENV: integration
+          - PYTHON_VERSION: '3.13'
+            TOXENV: integration
+          # python 3.14 integration tests are not run here because they're run as
+          # part of the standard test suite
+          - PYTHON_VERSION: '3.12'
+            TOXENV: integration-dns-rfc2136
+          - PYTHON_VERSION: '3.12'
+            TOXENV: test-farm-apache2
     uses: "./.github/workflows/tox_steps.yml"
     with:
       PYTHON_VERSION: "${{ matrix.PYTHON_VERSION }}"
       TOXENV: "${{ matrix.TOXENV }}"
-      IMAGE_NAME: "${{ matrix.IMAGE_NAME }}"
+      IMAGE_NAME: "${{ env.IMAGE_NAME }}"