Remove concurrency from CDN (SSL) test (#17038)

* Reshard cdn(ssl) tests

* Register new marker

* Only run SSL tests in one shard

* Limit parallelization

Author: janbrasna

.github/workflows/cdn_tests.yml

@@ -18,12 +18,17 @@ concurrency:
   group: cdn-tests
   cancel-in-progress: false
 
+permissions:
+  contents: read
+
 jobs:
   notify-of-test-run-start:
     if: github.repository == 'mozilla/bedrock'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
+        with:
+          sparse-checkout: .github/actions/slack
       - name: Notify via Slack that tests are starting
         uses: ./.github/actions/slack
         with:
@@ -36,25 +41,25 @@ jobs:
           message: "CDN tests started"
 
   cdn-tests:
+    if: github.repository == 'mozilla/bedrock'
     runs-on: ubuntu-latest
-    needs: notify-of-test-run-start
     strategy:
       matrix:
         include:
-          - LABEL: "CDN and SSL tests"
-            SHARD_LABEL: "cdn"
-            MARK_EXPRESSION: "cdn and not cdnprod"
-          - LABEL: "SSL client simulation"
-            SHARD_LABEL: "sim"
-            MARK_EXPRESSION: cdnprod
+          - LABEL: "CDN check"
+            SHARD_LABEL: cdn
+            MARK_EXPRESSION: "cdn and not cdnssl"
+          - LABEL: "SSL scan"
+            SHARD_LABEL: ssl
+            MARK_EXPRESSION: "cdnssl"
     env:
       BASE_URL: ${{ github.event.inputs.mozorg_service_hostname || 'https://www.mozilla.org' }} # Mozorg base URL
       BROWSER_NAME: ""
       CI_JOB_ID: ${{ github.run_id }}
       DRIVER: ""
       LABEL: ${{ matrix.LABEL }}
       MARK_EXPRESSION: ${{ matrix.MARK_EXPRESSION }}
-      PYTEST_PROCESSES: auto
+      PYTEST_PROCESSES: 1
       SAUCELABS_API_KEY: ""
       SAUCELABS_USERNAME: ""
       RERUNS_ALLOWED: 3
@@ -66,7 +71,7 @@ jobs:
 
     steps:
       - name: Fetch codebase
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Run CDN tests
         run: ./bin/integration_tests/functional_tests.sh
@@ -79,18 +84,20 @@ jobs:
 
       - name: Store artifacts
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: test-results-${{github.run_id}}-${{ matrix.SHARD_LABEL }}
           path: results-${{github.run_id}}
           if-no-files-found: ignore  # this avoids a false "Warning" if there were no issues
 
   notify-of-test-run-completion:
-    if: github.repository == 'mozilla/bedrock' && always()
+    if: always()
+    needs: cdn-tests
     runs-on: ubuntu-latest
-    needs: [notify-of-test-run-start, cdn-tests]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
+        with:
+          sparse-checkout: .github/actions/slack
       - name: Notify via Slack of test-run outcome
         uses: ./.github/actions/slack
         with:

setup.cfg

@@ -10,7 +10,7 @@ testpaths =
 # Declare custom pytest markers to reduce test-output noise
 markers =
     cdn
-    cdnprod
+    cdnssl
     download
     headless
     skip_if_firefox

tests/functional/test_cdn.py

@@ -44,6 +44,7 @@ def get_ssl_json_results(tmp_filename):
 
 
 @pytest.mark.cdn
+@pytest.mark.cdnssl
 @pytest.fixture(scope="session")
 def get_ssllabs_results(base_url):
     tmp_filename = "ssllabs_data.txt"
@@ -129,6 +130,7 @@ def test_cdn_cache(base_url):
 
 
 @pytest.mark.cdn
+@pytest.mark.cdnssl
 @pytest.mark.nondestructive
 @pytest.mark.parametrize("version", supported_versions, ids=itemgetter(0))
 def test_enabled_protocols(version, get_ssllabs_results):
@@ -143,6 +145,7 @@ def test_enabled_protocols(version, get_ssllabs_results):
 
 
 @pytest.mark.cdn
+@pytest.mark.cdnssl
 @pytest.mark.nondestructive
 @pytest.mark.parametrize("version", unsupported_versions, ids=itemgetter(0))
 def test_disabled_protocols(version, get_ssllabs_results):
@@ -157,6 +160,7 @@ def test_disabled_protocols(version, get_ssllabs_results):
 
 
 @pytest.mark.cdn
+@pytest.mark.cdnssl
 @pytest.mark.nondestructive
 @pytest.mark.parametrize("cipher", ciphers, ids=itemgetter(0))
 def test_enabled_ciphers(cipher, get_ssllabs_results):
@@ -171,7 +175,7 @@ def test_enabled_ciphers(cipher, get_ssllabs_results):
 
 
 @pytest.mark.cdn
-@pytest.mark.cdnprod
+@pytest.mark.cdnssl
 @pytest.mark.nondestructive
 def test_tls(get_ssllabs_results):
     """Check get_ssllabs_results to make sure that all expected clients connected without issue"""