remove irrelevant tests from cron jobs

2025-04-05 23:09:48 +00:00 · 2021-07-07 21:51:31 +02:00
parent 13b4806908
commit 4fcc13d9c1
4 changed files with 20 additions and 218 deletions
--- a/.github/workflows/test-devel.yml
+++ b/.github/workflows/test-devel.yml
@ -144,17 +144,16 @@ jobs:
    if: success() || failure()
    name: Publish Unit Tests Results
    needs:
-    - test-charybdis
-    - test-solanum
    - test-ergo
    - test-inspircd
-    - test-inspircd-atheme
    - test-inspircd-anope
-    - test-unrealircd
-    - test-unrealircd-atheme
-    - test-unrealircd-anope
+    - test-inspircd-atheme
    - test-limnoria
+    - test-solanum
    - test-sopel
+    - test-unrealircd
+    - test-unrealircd-anope
+    - test-unrealircd-atheme
    runs-on: ubuntu-latest
    steps:
    - name: Download Artifacts
@ -165,38 +164,6 @@ jobs:
      uses: EnricoMi/publish-unit-test-result-action@v1
      with:
        files: artifacts/**/*.xml
-  test-charybdis:
-    needs:
-    - build-charybdis
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-charybdis
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  make
-        charybdis
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest results charybdis (devel)
-        path: pytest.xml
  test-ergo:
    needs: []
    runs-on: ubuntu-latest
--- a/.github/workflows/test-devel_release.yml
+++ b/.github/workflows/test-devel_release.yml
@ -64,15 +64,10 @@ jobs:
    if: success() || failure()
    name: Publish Unit Tests Results
    needs:
-    - test-charybdis
-    - test-solanum
    - test-ergo
    - test-inspircd
-    - test-inspircd-atheme
    - test-inspircd-anope
-    - test-unrealircd
-    - test-unrealircd-atheme
-    - test-unrealircd-anope
+    - test-inspircd-atheme
    - test-limnoria
    - test-sopel
    runs-on: ubuntu-latest
@ -85,38 +80,6 @@ jobs:
      uses: EnricoMi/publish-unit-test-result-action@v1
      with:
        files: artifacts/**/*.xml
-  test-charybdis:
-    needs:
-    - build-charybdis
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-charybdis
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  make
-        charybdis
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest results charybdis (devel_release)
-        path: pytest.xml
  test-ergo:
    needs: []
    runs-on: ubuntu-latest
@ -267,38 +230,6 @@ jobs:
      with:
        name: pytest results limnoria (devel_release)
        path: pytest.xml
-  test-solanum:
-    needs:
-    - build-solanum
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-solanum
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  make
-        solanum
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest results solanum (devel_release)
-        path: pytest.xml
  test-sopel:
    needs: []
    runs-on: ubuntu-latest
@ -323,108 +254,6 @@ jobs:
      with:
        name: pytest results sopel (devel_release)
        path: pytest.xml
-  test-unrealircd:
-    needs:
-    - build-unrealircd
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-unrealircd
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/bin:$PATH
-        make unrealircd
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest results unrealircd (devel_release)
-        path: pytest.xml
-  test-unrealircd-anope:
-    needs:
-    - build-unrealircd
-    - build-anope
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-unrealircd
-        path: '~'
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-anope
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/bin:$PATH  make
-        unrealircd-anope
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest results unrealircd-anope (devel_release)
-        path: pytest.xml
-  test-unrealircd-atheme:
-    needs:
-    - build-unrealircd
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-unrealircd
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/unrealircd/bin:$PATH
-        make unrealircd-atheme
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest results unrealircd-atheme (devel_release)
-        path: pytest.xml
 name: irctest with devel_release versions
 'on':
  schedule:
--- a/.github/workflows/test-stable.yml
+++ b/.github/workflows/test-stable.yml
@ -183,16 +183,16 @@ jobs:
    name: Publish Unit Tests Results
    needs:
    - test-charybdis
-    - test-solanum
    - test-ergo
    - test-inspircd
-    - test-inspircd-atheme
    - test-inspircd-anope
-    - test-unrealircd
-    - test-unrealircd-atheme
-    - test-unrealircd-anope
+    - test-inspircd-atheme
    - test-limnoria
+    - test-solanum
    - test-sopel
+    - test-unrealircd
+    - test-unrealircd-anope
+    - test-unrealircd-atheme
    runs-on: ubuntu-latest
    steps:
    - name: Download Artifacts
--- a/make_workflows.py
+++ b/make_workflows.py
@ -135,7 +135,7 @@ def get_build_job(*, software_config, software_id, version_flavor):
    }


-def get_test_job(*, config, test_config, test_id, version_flavor):
+def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
    env = ""
    needs = []
    downloads = []
@ -170,6 +170,11 @@ def get_test_job(*, config, test_config, test_id, version_flavor):
                or []
            )

+    if not set(needs) <= jobs:
+        # One of the dependencies does not exist for this flavor
+        assert version_flavor != VersionFlavor.STABLE, set(needs) - jobs
+        return None
+
    if downloads:
        unpack = [
            {
@ -304,6 +309,7 @@ def generate_workflow(config: dict, version_flavor: VersionFlavor):
        }

    jobs = {}
+    jobs["build-anope"] = get_build_job_anope()

    for software_id in config["software"]:
        software_config = config["software"][software_id]
@ -322,14 +328,14 @@ def generate_workflow(config: dict, version_flavor: VersionFlavor):
            test_config=test_config,
            test_id=test_id,
            version_flavor=version_flavor,
+            jobs=set(jobs),
        )
        if test_job is not None:
            jobs[f"test-{test_id}"] = test_job

-    jobs["build-anope"] = get_build_job_anope()
    jobs["publish-test-results"] = {
        "name": "Publish Unit Tests Results",
-        "needs": [f"test-{test_id}" for test_id in config["tests"]],
+        "needs": sorted({f"test-{test_id}" for test_id in config["tests"]} & set(jobs)),
        "runs-on": "ubuntu-latest",
        # the build-and-test job might be skipped, we don't need to run
        # this job then