Merge pull request #11160 from nextcloud/backport/11116/stable28

[stable28] Improve conversation test split to have more even execution times
nextcloud · Dec 8, 2023 · 0042991 · 0042991
2 parents 3f38e97 + 1dd2bc3
commit 0042991
Show file tree

Hide file tree

Showing 52 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation', 'conversation-2', 'federation', 'integration', 'sharing', 'sharing-2']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable28']
         guests-versions: ['master']

diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation', 'conversation-2', 'federation', 'integration', 'sharing', 'sharing-2']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable28']
         guests-versions: ['master']

diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml
@@ -50,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation', 'conversation-2', 'federation', 'integration', 'sharing', 'sharing-2']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.3']
         server-versions: ['stable28']
         guests-versions: ['master']

diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: ['callapi', 'chat', 'chat-2', 'command', 'conversation', 'conversation-2', 'federation', 'integration', 'sharing', 'sharing-2']
+        test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable28']
         guests-versions: ['master']

diff --git a/tests/integration/features/chat/bots.feature → .../integration/features/chat-1/bots.feature b/tests/integration/features/chat/bots.feature → .../integration/features/chat-1/bots.feature
diff --git a/...ntegration/features/chat/commands.feature → ...egration/features/chat-1/commands.feature b/...ntegration/features/chat/commands.feature → ...egration/features/chat-1/commands.feature
diff --git a/.../integration/features/chat/delete.feature → ...ntegration/features/chat-1/delete.feature b/.../integration/features/chat/delete.feature → ...ntegration/features/chat-1/delete.feature
diff --git a/...egration/features/chat/file-share.feature → ...ration/features/chat-1/file-share.feature b/...egration/features/chat/file-share.feature → ...ration/features/chat-1/file-share.feature
diff --git a/...ion/features/chat/group-read-only.feature → ...n/features/chat-1/group-read-only.feature b/...ion/features/chat/group-read-only.feature → ...n/features/chat-1/group-read-only.feature
diff --git a/...s/integration/features/chat/group.feature → ...integration/features/chat-1/group.feature b/...s/integration/features/chat/group.feature → ...integration/features/chat-1/group.feature
diff --git a/...ntegration/features/chat/mentions.feature → ...egration/features/chat-1/mentions.feature b/...ntegration/features/chat/mentions.feature → ...egration/features/chat-1/mentions.feature
diff --git a/.../features/chat/message-expiration.feature → ...eatures/chat-1/message-expiration.feature b/.../features/chat/message-expiration.feature → ...eatures/chat-1/message-expiration.feature
diff --git a/...ration/features/chat/note-to-self.feature → ...tion/features/chat-1/note-to-self.feature b/...ration/features/chat/note-to-self.feature → ...tion/features/chat-1/note-to-self.feature
diff --git a/...ation/features/chat/notifications.feature → ...ion/features/chat-1/notifications.feature b/...ation/features/chat/notifications.feature → ...ion/features/chat-1/notifications.feature
diff --git a/...egration/features/chat/one-to-one.feature → ...ration/features/chat-1/one-to-one.feature b/...egration/features/chat/one-to-one.feature → ...ration/features/chat-1/one-to-one.feature
diff --git a/...ntegration/features/chat/password.feature → ...egration/features/chat-1/password.feature b/...ntegration/features/chat/password.feature → ...egration/features/chat-1/password.feature
diff --git a/...ures/conversation/add-participant.feature → ...es/conversation-1/add-participant.feature b/...ures/conversation/add-participant.feature → ...es/conversation-1/add-participant.feature
diff --git a/...tion/features/conversation/avatar.feature → ...on/features/conversation-1/avatar.feature b/...tion/features/conversation/avatar.feature → ...on/features/conversation-1/avatar.feature
diff --git a/...tures/conversation/breakout-rooms.feature → ...res/conversation-1/breakout-rooms.feature b/...tures/conversation/breakout-rooms.feature → ...res/conversation-1/breakout-rooms.feature
diff --git a/...onversation/bruteforce-protection.feature → ...versation-1/bruteforce-protection.feature b/...onversation/bruteforce-protection.feature → ...versation-1/bruteforce-protection.feature
diff --git a/...features/conversation/delete-room.feature → ...atures/conversation-1/delete-room.feature b/...features/conversation/delete-room.feature → ...atures/conversation-1/delete-room.feature
diff --git a/...features/conversation/delete-user.feature → ...atures/conversation-1/delete-user.feature b/...features/conversation/delete-user.feature → ...atures/conversation-1/delete-user.feature
diff --git a/...ation/features/conversation/files.feature → ...ion/features/conversation-2/files.feature b/...ation/features/conversation/files.feature → ...ion/features/conversation-2/files.feature
diff --git a/...features/conversation/find-listed.feature → ...atures/conversation-2/find-listed.feature b/...features/conversation/find-listed.feature → ...atures/conversation-2/find-listed.feature
diff --git a/...atures/conversation/join-listable.feature → ...ures/conversation-2/join-listable.feature b/...atures/conversation/join-listable.feature → ...ures/conversation-2/join-listable.feature
diff --git a/...s/conversation/group-participants.feature → ...conversation-3/group-participants.feature b/...s/conversation/group-participants.feature → ...conversation-3/group-participants.feature
diff --git a/...eatures/conversation/invite-email.feature → ...tures/conversation-3/invite-email.feature b/...eatures/conversation/invite-email.feature → ...tures/conversation-3/invite-email.feature
diff --git a/.../features/conversation/join-leave.feature → ...eatures/conversation-3/join-leave.feature b/.../features/conversation/join-leave.feature → ...eatures/conversation-3/join-leave.feature
diff --git a/...tures/conversation/limit-creation.feature → ...res/conversation-3/limit-creation.feature b/...tures/conversation/limit-creation.feature → ...res/conversation-3/limit-creation.feature
diff --git a/...ation/features/conversation/lobby.feature → ...ion/features/conversation-3/lobby.feature b/...ation/features/conversation/lobby.feature → ...ion/features/conversation-3/lobby.feature
diff --git a/...eatures/conversation-2/one-to-one.feature → ...eatures/conversation-3/one-to-one.feature b/...eatures/conversation-2/one-to-one.feature → ...eatures/conversation-3/one-to-one.feature
diff --git a/...res/conversation-2/public-private.feature → ...res/conversation-3/public-private.feature b/...res/conversation-2/public-private.feature → ...res/conversation-3/public-private.feature
diff --git a/...s/conversation-2/password-request.feature → ...s/conversation-4/password-request.feature b/...s/conversation-2/password-request.feature → ...s/conversation-4/password-request.feature
diff --git a/...conversation-2/promotion-demotion.feature → ...conversation-4/promotion-demotion.feature b/...conversation-2/promotion-demotion.feature → ...conversation-4/promotion-demotion.feature
diff --git a/...conversation-2/remove-participant.feature → ...conversation-4/remove-participant.feature b/...conversation-2/remove-participant.feature → ...conversation-4/remove-participant.feature
diff --git a/...atures/conversation-2/remove-self.feature → ...atures/conversation-4/remove-self.feature b/...atures/conversation-2/remove-self.feature → ...atures/conversation-4/remove-self.feature
diff --git a/...atures/conversation-2/rename-room.feature → ...atures/conversation-4/rename-room.feature b/...atures/conversation-2/rename-room.feature → ...atures/conversation-4/rename-room.feature
diff --git a/...es/conversation-2/set-description.feature → ...es/conversation-5/set-description.feature b/...es/conversation-2/set-description.feature → ...es/conversation-5/set-description.feature
diff --git a/...tures/conversation-2/set-listable.feature → ...tures/conversation-5/set-listable.feature b/...tures/conversation-2/set-listable.feature → ...tures/conversation-5/set-listable.feature
diff --git a/...ion-2/set-participant-permissions.feature → ...ion-5/set-participant-permissions.feature b/...ion-2/set-participant-permissions.feature → ...ion-5/set-participant-permissions.feature
diff --git a/...tures/conversation-2/set-password.feature → ...tures/conversation-5/set-password.feature b/...tures/conversation-2/set-password.feature → ...tures/conversation-5/set-password.feature
diff --git a/...es/conversation-2/set-permissions.feature → ...es/conversation-5/set-permissions.feature b/...es/conversation-2/set-permissions.feature → ...es/conversation-5/set-permissions.feature
diff --git a/...eatures/conversation-2/sip-dialin.feature → ...eatures/conversation-5/sip-dialin.feature b/...eatures/conversation-2/sip-dialin.feature → ...eatures/conversation-5/sip-dialin.feature
diff --git a/...atures/conversation-2/sip-dialout.feature → ...atures/conversation-5/sip-dialout.feature b/...atures/conversation-2/sip-dialout.feature → ...atures/conversation-5/sip-dialout.feature
diff --git a/...tegration/features/sharing/create.feature → ...gration/features/sharing-1/create.feature b/...tegration/features/sharing/create.feature → ...gration/features/sharing-1/create.feature
diff --git a/...tegration/features/sharing/delete.feature → ...gration/features/sharing-1/delete.feature b/...tegration/features/sharing/delete.feature → ...gration/features/sharing-1/delete.feature
diff --git a/...integration/features/sharing/move.feature → ...tegration/features/sharing-1/move.feature b/...integration/features/sharing/move.feature → ...tegration/features/sharing-1/move.feature
diff --git a/...egration/features/sharing/restore.feature → ...ration/features/sharing-1/restore.feature b/...egration/features/sharing/restore.feature → ...ration/features/sharing-1/restore.feature
diff --git a/...egration/features/sharing-2/hooks.feature → ...egration/features/sharing-3/hooks.feature b/...egration/features/sharing-2/hooks.feature → ...egration/features/sharing-3/hooks.feature
diff --git a/...egration/features/sharing/sharees.feature → ...ration/features/sharing-4/sharees.feature b/...egration/features/sharing/sharees.feature → ...ration/features/sharing-4/sharees.feature
diff --git a/...atures/sharing/transfer-ownership.feature → ...ures/sharing-4/transfer-ownership.feature b/...atures/sharing/transfer-ownership.feature → ...ures/sharing-4/transfer-ownership.feature
diff --git a/...tegration/features/sharing/update.feature → ...gration/features/sharing-4/update.feature b/...tegration/features/sharing/update.feature → ...gration/features/sharing-4/update.feature