enable CI on cloud again (server seems to be pretty hard tbh)

.github/workflows/jira_cloud_ci.yml

@@ -1,6 +1,7 @@
 name: cloud
 
 on:
+  pull_request:
   workflow_call:
     inputs:
       ref:
@@ -32,14 +33,15 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        # We only test a single version to prevent concurrent
-        # running of tests influencing one another
         python-version: ["3.10"]
+    concurrency:
+      group: jira-cloud-tests
+      cancel-in-progress: false
 
     steps:
       - uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.inputs.ref }}
+          ref: ${{ github.ref }}
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
@@ -57,10 +59,10 @@ jobs:
         run: tox run -e py310 -- -m allow_on_cloud
         env:
           CI_JIRA_TYPE: CLOUD
-          CI_JIRA_CLOUD_ADMIN: ${{ secrets.CLOUD_ADMIN }}
-          CI_JIRA_CLOUD_ADMIN_TOKEN: ${{ secrets.CLOUD_ADMIN_TOKEN }}
-          CI_JIRA_CLOUD_USER: ${{ secrets.CLOUD_USER }}
-          CI_JIRA_CLOUD_USER_TOKEN: ${{ secrets.CLOUD_USER_TOKEN }}
+          CI_JIRA_CLOUD_ADMIN: ${{ secrets.CI_JIRA_CLOUD_ADMIN }}
+          CI_JIRA_CLOUD_ADMIN_TOKEN: ${{ secrets.CI_JIRA_CLOUD_ADMIN_TOKEN }}
+          CI_JIRA_CLOUD_USER: ${{ secrets.CI_JIRA_CLOUD_USER }}
+          CI_JIRA_CLOUD_USER_TOKEN: ${{ secrets.CI_JIRA_CLOUD_USER_TOKEN }}
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5

.github/workflows/tox.yml

@@ -1,206 +1,35 @@
----
-name: tox
-on:
-  merge_group:
-    branches:
-      - "main"
-  push:
-    branches:
-      - "main"
-  pull_request:
-    branches:
-      - "main"
-  schedule:
-    - cron: "0 0 * * *"
-  workflow_call:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
+name: Tox
 
-env:
-  FORCE_COLOR: 1 # tox, pytest
-  PY_COLORS: 1
+on:
+  - pull_request
 
 jobs:
-  prepare:
-    name: prepare
-    runs-on: ubuntu-24.04
-    outputs:
-      matrix: ${{ steps.generate_matrix.outputs.matrix }}
-    steps:
-      - name: Determine matrix
-        id: generate_matrix
-        uses: coactions/dynamic-matrix@v4
-        with:
-          min_python: "3.10"
-          max_python: "3.12"
-          default_python: "3.10"
-          other_names: |
-            lint
-            docs
-            pkg
-            devel:tox -e devel -- -k test_unit
-            py310:tox -e py310 -- -k test_unit
-            py311:tox -e py311 -- -k test_unit
-            py312:tox -e py312 -- -k test_unit
-            py310-macos:tox -e py310 -- -k test_unit
-            py312-macos:tox -e py312 -- -k test_unit
-          # ^ macos is also used to validate arm64 building
-          platforms: linux,macos
-          skip_explode: "1"
   build:
-    name: ${{ matrix.name }}
-    runs-on: ${{ matrix.os || 'ubuntu-24.04' }}
-    needs:
-      - prepare
+    runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
-    steps:
-
-      - name: Install package dependencies (ubuntu)
-        if: ${{ contains(matrix.os, 'ubuntu') }}
-        run: |
-          sudo apt remove -y docker-compose
-          sudo apt-get update -y
-          sudo apt-get --assume-yes --no-install-recommends install -y apt-transport-https curl libkrb5-dev
-
-      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 0 # needed by setuptools-scm
-          submodules: true
-
-      - name: Set pre-commit cache
-        uses: actions/cache@v4
-        if: ${{ contains(matrix.name, 'lint') }}
-        with:
-          path: |
-            ~/.cache/pre-commit
-          key: pre-commit-${{ matrix.name }}-${{ hashFiles('.pre-commit-config.yaml') }}
-
-      - name: Set up Python ${{ matrix.python_version || '3.10' }}
-        uses: actions/setup-python@v6
-        with:
-          cache: pip
-          python-version: ${{ matrix.python_version || '3.10' }}
-          cache-dependency-path: "*requirements*.txt"
-
-      - name: Install tox
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install --upgrade "tox>=4.0.0" "tox-uv>=1.25.0" "uv>=0.6.6"
-
-      - run: ${{ matrix.command }}
-
-      - run: ${{ matrix.command2 }}
-        if: ${{ matrix.command2 }}
-
-      - run: ${{ matrix.command3 }}
-        if: ${{ matrix.command3 }}
-
-      - run: ${{ matrix.command4 }}
-        if: ${{ matrix.command4 }}
-
-      - run: ${{ matrix.command5 }}
-        if: ${{ matrix.command5 }}
-
-      - name: Archive logs
-        uses: actions/upload-artifact@v4
-        with:
-          name: logs-${{ matrix.name }}.zip
-          include-hidden-files: true
-          path: |
-            .tox/**/log/
-            .tox/**/.coverage*
-            .tox/**/coverage.xml
-
-      - name: Report failure if git reports dirty status
-        run: |
-          if [[ -n $(git status -s) ]]; then
-            # shellcheck disable=SC2016
-            echo -n '::error file=git-status::'
-            printf '### Failed as git reported modified and/or untracked files\n```\n%s\n```\n' "$(git status -s)" | tee -a "$GITHUB_STEP_SUMMARY"
-            exit 99
-          fi
-        # https://github.com/actions/toolkit/issues/193
-  check:
-    if: always()
-    environment: check
-    permissions:
-      id-token: write
-      checks: read
-
-    needs:
-      - build
-
-    runs-on: ubuntu-24.04
+      matrix:
+        include:
+          - python-version: '3.10'
+            tox-env: 'py310'
+          # - python-version: '3.11'
+          #   tox-env: 'py311'
+          # - python-version: '3.12'
+          #   tox-env: 'py312'
 
     steps:
-      # checkout needed for codecov action which needs codecov.yml file
       - uses: actions/checkout@v5
-
-      - name: Set up Python # likely needed for coverage
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
         with:
-          python-version: "3.12"
-
-      - run: pip3 install 'coverage>=7.5.1'
-
-      - name: Merge logs into a single archive
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: logs.zip
-          include-hidden-files: true
-          pattern: logs-*.zip
-          # artifacts like py312.zip and py312-macos do have overlapping files
-          separate-directories: true
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v5
-        continue-on-error: true # to allow rerunning this job
-        with:
-          name: logs.zip
-          path: .
-
-      - name: Check for expected number of coverage.xml reports
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
         run: |
-          JOBS_PRODUCING_COVERAGE=5
-          if [ "$(find . -name coverage.xml | wc -l | bc)" -ne "${JOBS_PRODUCING_COVERAGE}" ]; then
-            echo "::error::Number of coverage.xml files was not the expected one (${JOBS_PRODUCING_COVERAGE}): $(find . -name coverage.xml |xargs echo)"
-            exit 1
-          fi
-
-      # Single uploads inside check job for codecov to allow use to retry
-      # it when it fails without running tests again. Fails often enough!
-      - name: Upload junit xml reports
-        # PRs from forks might not have access to the secret
-        if: env.CODECOV_TOKEN
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN || env.CODECOV_TOKEN }}
-        uses: codecov/test-results-action@v1
-        with:
-          name: ${{ matrix.name }}
-          files: "*/tests/output/junit/*.xml"
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Upload coverage data
-        uses: codecov/codecov-action@v5
-        with:
-          name: ${{ matrix.name }}
-          # verbose: true # optional (default = false)
-          fail_ci_if_error: true
-          use_oidc: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }} # cspell:ignore oidc
-
-      - name: Decide whether the needed jobs succeeded or failed
-        uses: re-actors/alls-green@release/v1
-        with:
-          jobs: ${{ toJSON(needs) }}
-
-      - name: Delete Merged Artifacts
-        uses: actions/upload-artifact/merge@v4
-        with:
-          include-hidden-files: true
-          delete-merged: true
-          pattern: logs-*.zip
+          sudo apt remove -y docker-compose
+          sudo apt-get update -y
+          sudo apt-get --assume-yes --no-install-recommends install -y apt-transport-https curl libkrb5-dev
+          sudo rm -rf /var/lib/apt/lists/*
+          python -m pip install --upgrade pip setuptools wheel
+          python -m pip install tox tox-gh-actions
+      - name: Test with tox
+        # run only the env that matches the runner Python (e.g. 3.10 -> py310)
+        run: tox -e ${{ matrix.tox-env }}

tests/resources/test_board.py

@@ -4,7 +4,7 @@
 from contextlib import contextmanager
 
 from jira.resources import Board
-from tests.conftest import JiraTestCase, rndstr
+from tests.conftest import JiraTestCase, allow_on_cloud, rndstr
 
 
 class BoardTests(JiraTestCase):
@@ -41,6 +41,7 @@ def _create_board(self) -> Iterator[Board]:
             if board is not None:
                 board.delete()
 
+    @allow_on_cloud
     def test_create_and_delete(self):
         # GIVEN: The filter
         # WHEN: we create a board

tests/resources/test_comment.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from tests.conftest import JiraTestCase
+from tests.conftest import JiraTestCase, allow_on_cloud
 
 
 class CommentTests(JiraTestCase):
@@ -15,6 +15,7 @@ def tearDown(self) -> None:
             for comment in self.jira.comments(issue):
                 comment.delete()
 
+    @allow_on_cloud
     def test_comments(self):
         for issue in [self.issue_1_key, self.jira.issue(self.issue_2_key)]:
             self.jira.issue(issue)
@@ -28,6 +29,7 @@ def test_comments(self):
             comments = self.jira.comments(issue)
             assert len(comments) == 0
 
+    @allow_on_cloud
     def test_comments_start_at(self):
         comments_created = []
         for i in range(10):
@@ -42,6 +44,7 @@ def test_comments_start_at(self):
         comments = self.jira.comments(self.issue_1_key)
         assert len(comments) == 0
 
+    @allow_on_cloud
     def test_comments_max_results(self):
         comments_created = []
         for i in range(10):
@@ -56,6 +59,7 @@ def test_comments_max_results(self):
         comments = self.jira.comments(self.issue_1_key)
         assert len(comments) == 0
 
+    @allow_on_cloud
     def test_comments_order_by(self):
         comments_created = []
         for i in range(10):
@@ -73,6 +77,7 @@ def test_comments_order_by(self):
         comments = self.jira.comments(self.issue_1_key)
         assert len(comments) == 0
 
+    @allow_on_cloud
     def test_expanded_comments(self):
         comment1 = self.jira.add_comment(self.issue_1_key, "First comment")
         comment2 = self.jira.add_comment(self.issue_1_key, "Second comment")
@@ -89,6 +94,7 @@ def test_expanded_comments(self):
         comments = self.jira.comments(self.issue_1_key)
         assert len(comments) == 0
 
+    @allow_on_cloud
     def test_add_comment(self):
         comment = self.jira.add_comment(
             self.issue_3_key,
@@ -100,6 +106,7 @@ def test_add_comment(self):
         self.assertEqual(comment.visibility.value, "Administrators")
         comment.delete()
 
+    @allow_on_cloud
     def test_add_comment_with_issue_obj(self):
         issue = self.jira.issue(self.issue_3_key)
         comment = self.jira.add_comment(
@@ -112,6 +119,7 @@ def test_add_comment_with_issue_obj(self):
         self.assertEqual(comment.visibility.value, "Administrators")
         comment.delete()
 
+    @allow_on_cloud
     def test_update_comment(self):
         comment = self.jira.add_comment(self.issue_3_key, "updating soon!")
         comment.update(body="updated!")
@@ -120,6 +128,7 @@ def test_update_comment(self):
         # self.assertEqual(comment.visibility.value, 'Administrators')
         comment.delete()
 
+    @allow_on_cloud
     def test_update_comment_with_notify(self):
         comment = self.jira.add_comment(self.issue_3_key, "updating soon!")
         comment.update(body="updated! without notification", notify=False)