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

.github/workflows/jira_cloud_ci.yml

@@ -27,7 +27,7 @@ on:
 jobs:
   test:
     environment: cloud
-    name: py${{ matrix.python-version }}
+    name: cloud-py${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     strategy:
       # Single python version - concurrent runs would fight over
@@ -63,10 +63,10 @@ jobs:
         run: tox -e "py$(echo '${{ matrix.python-version }}' | tr -d .)" -- -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/jira_server_ci.yml

@@ -22,7 +22,7 @@ on:
 
 jobs:
   test:
-    name: py${{ matrix.python-version }}-jira${{ matrix.jira-version }}
+    name: server-py${{ matrix.python-version }}-jira${{ matrix.jira-version }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

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)

tests/resources/test_component.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from jira.exceptions import JIRAError
-from tests.conftest import JiraTestCase, rndstr
+from tests.conftest import JiraTestCase, allow_on_cloud, rndstr
 
 
 class ComponentTests(JiraTestCase):
@@ -10,6 +10,7 @@ def setUp(self):
         self.issue_1 = self.test_manager.project_b_issue1
         self.issue_2 = self.test_manager.project_b_issue2
 
+    @allow_on_cloud
     def test_2_create_component(self):
         proj = self.jira.project(self.project_b)
         name = f"project-{proj}-component-{rndstr()}"
@@ -67,6 +68,7 @@ def test_3_update(self):
         self.assertEqual(component.lead.name, self.jira.current_user())
         component.delete()
 
+    @allow_on_cloud
     def test_4_delete(self):
         component = self.jira.create_component(
             "To be deleted", self.project_b, description="not long for this world"
@@ -75,6 +77,7 @@ def test_4_delete(self):
         component.delete()
         self.assertRaises(JIRAError, self.jira.component, myid)
 
+    @allow_on_cloud
     def test_delete_component_by_id(self):
         component = self.jira.create_component(
             "To be deleted", self.project_b, description="not long for this world"

tests/resources/test_dashboard.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import time
+from contextlib import suppress
 from unittest import mock
 
 import pytest
@@ -35,7 +37,8 @@ def setUp(self):
 
     def tearDown(self):
         for dashboard in self.dashboards_to_delete:
-            dashboard.delete()
+            with suppress(JIRAError):
+                dashboard.delete()
         super().tearDown()
 
     def test_dashboards(self):
@@ -261,6 +264,7 @@ def test_update_gadget(self):
             name=rndstr(), share_permissions=[{"type": "authenticated"}]
         )
         self.dashboards_to_delete.append(dashboard)
+        time.sleep(1)
         available_gadgets = self.jira.all_dashboard_gadgets()
         filter_gadget = next(
             gadget for gadget in available_gadgets if gadget.title == self.gadget_title
@@ -271,7 +275,7 @@ def test_update_gadget(self):
             ignore_uri_and_module_key_validation=True,
             uri=filter_gadget.uri,
         )
-
+        time.sleep(1)
         gadget = gadget.update(dashboard.id, color=new_color)
         self.assertEqual(gadget.color, new_color)
         self.assertEqual(gadget.raw["color"], new_color)

tests/resources/test_epic.py

@@ -7,7 +7,7 @@
 from parameterized import parameterized
 
 from jira.resources import Issue
-from tests.conftest import JiraTestCase, rndstr
+from tests.conftest import JiraTestCase, allow_on_cloud, rndstr
 
 
 class EpicTests(JiraTestCase):
@@ -33,24 +33,29 @@ def epic_field_name(self):
     def make_epic(self, **kwargs) -> Iterator[Issue]:
         try:
             # TODO: create_epic() method should exist!
-            new_epic = self.jira.create_issue(
-                fields={
+            new_epic_fields = {
                     "issuetype": {"name": "Epic"},
                     "project": self.project_b,
-                    self.epic_field_name: self.epic_name,
                     "summary": f"Epic summary for '{self.epic_name}'",
-                },
+                }
+            if not self.is_jira_cloud_ci:
+                new_epic_fields[self.epic_field_name] = self.epic_name
+            new_epic_fields.update(kwargs)
+            new_epic = self.jira.create_issue(
+                fields=new_epic_fields,
             )
             if len(kwargs):
                 raise ValueError("Incorrect kwarg used !")
             yield new_epic
         finally:
             new_epic.delete()
 
+    @allow_on_cloud
     def test_epic_create_delete(self):
         with self.make_epic():
             pass
 
+    @allow_on_cloud
     @parameterized.expand(
         [("str", str), ("list", list)],
     )

tests/resources/test_filter.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+import time
 from contextlib import contextmanager
 
-from tests.conftest import JiraTestCase, rndstr
+from tests.conftest import JiraTestCase, allow_on_cloud, rndstr
 
 
 class FilterTests(JiraTestCase):
@@ -27,21 +28,27 @@ def make_filter(self, **kwargs):
             )
             if len(kwargs):
                 raise ValueError("Incorrect kwarg used !")
+            if self.jira._is_cloud:
+                time.sleep(1)
             yield new_filter
         finally:
             new_filter.delete()
 
+    @allow_on_cloud
     def test_filter(self):
         with self.make_filter() as myfilter:
             self.assertEqual(myfilter.name, self.filter_name)
-            self.assertEqual(myfilter.owner.name, self.test_manager.user_admin.name)
+            if not self.is_jira_cloud_ci:
+                self.assertEqual(myfilter.owner.name, self.test_manager.user_admin.name)
 
+    @allow_on_cloud
     def test_favourite_filters(self):
         filter_name = f"filter-to-fav-{self.filter_name}"
         with self.make_filter(name=filter_name, favourite=True):
             new_filters = self.jira.favourite_filters()
             assert filter_name in [f.name for f in new_filters]
 
+    @allow_on_cloud
     def test_filter_update_empty_description(self):
         new_jql = f"{self.filter_jql} ORDER BY created ASC"
         new_name = f"new_{self.filter_name}"
@@ -58,6 +65,7 @@ def test_filter_update_empty_description(self):
             assert updated_filter.jql == new_jql
             assert not hasattr(updated_filter, "description")
 
+    @allow_on_cloud
     def test_filter_update_empty_description_with_new_description(self):
         new_desc = "new description"
         with self.make_filter(description=None) as myfilter:

tests/resources/test_generic_resource.py

@@ -3,6 +3,7 @@
 import pytest
 
 import jira.resources
+from tests.conftest import allow_on_cloud
 
 MOCK_URL = "http://customized-jira.com/rest/"
 
@@ -43,6 +44,7 @@ class TestResource:
         ],
     )
     # fmt: on
+    @allow_on_cloud
     def test_cls_for_resource(self, example_url, expected_class):
         """Test the regex recognizes the right class for a given URL."""
         assert jira.resources.cls_for_resource(example_url) == expected_class