From e37f293436ca8fc9d0847fecde3ab13ae649fee3 Mon Sep 17 00:00:00 2001
From: Carlos Rodriguez <crodveg@gmail.com>
Date: Thu, 17 Nov 2022 09:56:06 +0100
Subject: [PATCH 1/6] remove irrelevant compatibility tests (i.e. tests between
 already released tags)

---
 .../{transfer.json => transfer-chain-a.json}      |  7 +++++--
 ...transfer-params.json => transfer-chain-b.json} |  6 +++++-
 .../release-v2.5.x/transfer-memo.json             | 10 ----------
 .../{transfer.json => transfer-chain-a.json}      |  7 +++++--
 ...transfer-params.json => transfer-chain-b.json} |  6 +++++-
 .../release-v3.4.x/transfer-memo.json             | 10 ----------
 ...er.json => incentivized-transfer-chain-a.json} |  2 +-
 .../incentivized-transfer-chain-b.json            | 15 +++++++++++++++
 .../{transfer.json => transfer-chain-a.json}      |  7 +++++--
 ...transfer-params.json => transfer-chain-b.json} |  6 +++++-
 .../release-v4.2.x/transfer-memo.json             | 10 ----------
 .../{client.json => client-chain-a.json}          |  2 +-
 .../release-v5.0.x/client-chain-b.json            | 10 ++++++++++
 .../{connection.json => connection-chain-a.json}  |  2 +-
 .../release-v5.0.x/connection-chain-b.json        | 10 ++++++++++
 ...er.json => incentivized-transfer-chain-a.json} |  2 +-
 .../incentivized-transfer-chain-b.json            | 15 +++++++++++++++
 .../{transfer.json => transfer-chain-a.json}      |  6 ++++--
 ...transfer-params.json => transfer-chain-b.json} |  5 ++++-
 ...er.json => incentivized-transfer-chain-a.json} |  2 +-
 .../incentivized-transfer-chain-b.json            | 15 +++++++++++++++
 .../{transfer.json => transfer-chain-a.json}      |  7 +++++--
 ...transfer-params.json => transfer-chain-b.json} |  8 ++++++--
 .../release-v5.1.x/transfer-memo.json             | 10 ----------
 .../{client.json => client-chain-a.json}          |  2 +-
 .../{transfer-memo.json => client-chain-b.json}   |  6 +++---
 .../{connection.json => connection-chain-a.json}  |  2 +-
 .../release-v6.0.x/connection-chain-b.json        | 10 ++++++++++
 ...er.json => incentivized-transfer-chain-a.json} |  2 +-
 .../incentivized-transfer-chain-b.json            | 15 +++++++++++++++
 .../{transfer.json => transfer-chain-a.json}      |  7 +++++--
 ...transfer-params.json => transfer-chain-b.json} |  6 +++++-
 32 files changed, 160 insertions(+), 70 deletions(-)
 rename .github/compatibility-test-matrices/release-v2.5.x/{transfer.json => transfer-chain-a.json} (66%)
 rename .github/compatibility-test-matrices/release-v2.5.x/{transfer-params.json => transfer-chain-b.json} (60%)
 delete mode 100644 .github/compatibility-test-matrices/release-v2.5.x/transfer-memo.json
 rename .github/compatibility-test-matrices/release-v3.4.x/{transfer.json => transfer-chain-a.json} (66%)
 rename .github/compatibility-test-matrices/release-v3.4.x/{transfer-params.json => transfer-chain-b.json} (60%)
 delete mode 100644 .github/compatibility-test-matrices/release-v3.4.x/transfer-memo.json
 rename .github/compatibility-test-matrices/release-v4.2.x/{incentivized-transfer.json => incentivized-transfer-chain-a.json} (89%)
 create mode 100644 .github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-b.json
 rename .github/compatibility-test-matrices/release-v4.2.x/{transfer.json => transfer-chain-a.json} (66%)
 rename .github/compatibility-test-matrices/release-v4.2.x/{transfer-params.json => transfer-chain-b.json} (59%)
 delete mode 100644 .github/compatibility-test-matrices/release-v4.2.x/transfer-memo.json
 rename .github/compatibility-test-matrices/release-v5.0.x/{client.json => client-chain-a.json} (73%)
 create mode 100644 .github/compatibility-test-matrices/release-v5.0.x/client-chain-b.json
 rename .github/compatibility-test-matrices/release-v5.0.x/{connection.json => connection-chain-a.json} (73%)
 create mode 100644 .github/compatibility-test-matrices/release-v5.0.x/connection-chain-b.json
 rename .github/compatibility-test-matrices/release-v5.0.x/{incentivized-transfer.json => incentivized-transfer-chain-a.json} (89%)
 create mode 100644 .github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer-chain-b.json
 rename .github/compatibility-test-matrices/release-v5.0.x/{transfer.json => transfer-chain-a.json} (69%)
 rename .github/compatibility-test-matrices/release-v5.0.x/{transfer-params.json => transfer-chain-b.json} (63%)
 rename .github/compatibility-test-matrices/release-v5.1.x/{incentivized-transfer.json => incentivized-transfer-chain-a.json} (89%)
 create mode 100644 .github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer-chain-b.json
 rename .github/compatibility-test-matrices/release-v5.1.x/{transfer.json => transfer-chain-a.json} (66%)
 rename .github/compatibility-test-matrices/release-v5.1.x/{transfer-params.json => transfer-chain-b.json} (59%)
 delete mode 100644 .github/compatibility-test-matrices/release-v5.1.x/transfer-memo.json
 rename .github/compatibility-test-matrices/release-v6.0.x/{client.json => client-chain-a.json} (72%)
 rename .github/compatibility-test-matrices/release-v6.0.x/{transfer-memo.json => client-chain-b.json} (52%)
 rename .github/compatibility-test-matrices/release-v6.0.x/{connection.json => connection-chain-a.json} (72%)
 create mode 100644 .github/compatibility-test-matrices/release-v6.0.x/connection-chain-b.json
 rename .github/compatibility-test-matrices/release-v6.0.x/{incentivized-transfer.json => incentivized-transfer-chain-a.json} (88%)
 create mode 100644 .github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer-chain-b.json
 rename .github/compatibility-test-matrices/release-v6.0.x/{transfer.json => transfer-chain-a.json} (66%)
 rename .github/compatibility-test-matrices/release-v6.0.x/{transfer-params.json => transfer-chain-b.json} (60%)

diff --git a/.github/compatibility-test-matrices/release-v2.5.x/transfer.json b/.github/compatibility-test-matrices/release-v2.5.x/transfer-chain-a.json
similarity index 66%
rename from .github/compatibility-test-matrices/release-v2.5.x/transfer.json
rename to .github/compatibility-test-matrices/release-v2.5.x/transfer-chain-a.json
index 96af07c1054..ac062eb3cbb 100644
--- a/.github/compatibility-test-matrices/release-v2.5.x/transfer.json
+++ b/.github/compatibility-test-matrices/release-v2.5.x/transfer-chain-a.json
@@ -1,11 +1,14 @@
 {
-  "chain-a": ["release-v2.5.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v2.5.x"],
   "chain-b": ["release-v2.5.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
-    "TestMsgTransfer_Timeout_Nonincentivized"
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
+    "TestSendEnabledParam",
+    "TestReceiveEnabledParam"
   ],
   "chain-binary": ["simd"],
   "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
diff --git a/.github/compatibility-test-matrices/release-v2.5.x/transfer-params.json b/.github/compatibility-test-matrices/release-v2.5.x/transfer-chain-b.json
similarity index 60%
rename from .github/compatibility-test-matrices/release-v2.5.x/transfer-params.json
rename to .github/compatibility-test-matrices/release-v2.5.x/transfer-chain-b.json
index 3e350af7cf3..4eea85c0e92 100644
--- a/.github/compatibility-test-matrices/release-v2.5.x/transfer-params.json
+++ b/.github/compatibility-test-matrices/release-v2.5.x/transfer-chain-b.json
@@ -1,8 +1,12 @@
 {
   "chain-a": ["release-v2.5.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v2.5.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v2.5.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
+    "TestMsgTransfer_Succeeds_Nonincentivized",
+    "TestMsgTransfer_Fails_InvalidAddress",
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
     "TestSendEnabledParam",
     "TestReceiveEnabledParam"
   ],
diff --git a/.github/compatibility-test-matrices/release-v2.5.x/transfer-memo.json b/.github/compatibility-test-matrices/release-v2.5.x/transfer-memo.json
deleted file mode 100644
index 66138c4d88f..00000000000
--- a/.github/compatibility-test-matrices/release-v2.5.x/transfer-memo.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "chain-a": ["release-v2.5.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v2.5.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "entrypoint": ["TestTransferTestSuite"],
-  "test": [
-    "TestMsgTransfer_WithMemo"
-  ],
-  "chain-binary": ["simd"],
-  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
-}
diff --git a/.github/compatibility-test-matrices/release-v3.4.x/transfer.json b/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json
similarity index 66%
rename from .github/compatibility-test-matrices/release-v3.4.x/transfer.json
rename to .github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json
index 425ea86d220..b6a5c57b874 100644
--- a/.github/compatibility-test-matrices/release-v3.4.x/transfer.json
+++ b/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json
@@ -1,11 +1,14 @@
 {
-  "chain-a": ["release-v3.4.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v3.4.x"],
   "chain-b": ["release-v3.4.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
-    "TestMsgTransfer_Timeout_Nonincentivized"
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
+    "TestSendEnabledParam",
+    "TestReceiveEnabledParam"
   ],
   "chain-binary": ["simd"],
   "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
diff --git a/.github/compatibility-test-matrices/release-v3.4.x/transfer-params.json b/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json
similarity index 60%
rename from .github/compatibility-test-matrices/release-v3.4.x/transfer-params.json
rename to .github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json
index 8ab68362796..649949b7518 100644
--- a/.github/compatibility-test-matrices/release-v3.4.x/transfer-params.json
+++ b/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json
@@ -1,8 +1,12 @@
 {
   "chain-a": ["release-v3.4.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v3.4.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v3.4.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
+    "TestMsgTransfer_Succeeds_Nonincentivized",
+    "TestMsgTransfer_Fails_InvalidAddress",
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
     "TestSendEnabledParam",
     "TestReceiveEnabledParam"
   ],
diff --git a/.github/compatibility-test-matrices/release-v3.4.x/transfer-memo.json b/.github/compatibility-test-matrices/release-v3.4.x/transfer-memo.json
deleted file mode 100644
index 41e732d5ecf..00000000000
--- a/.github/compatibility-test-matrices/release-v3.4.x/transfer-memo.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "chain-a": ["release-v3.4.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v3.4.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "entrypoint": ["TestTransferTestSuite"],
-  "test": [
-    "TestMsgTransfer_WithMemo"
-  ],
-  "chain-binary": ["simd"],
-  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
-}
diff --git a/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer.json b/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-a.json
similarity index 89%
rename from .github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer.json
rename to .github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-a.json
index e3a72b637ef..dceb3f42289 100644
--- a/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer.json
+++ b/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1"],
+  "chain-a": ["release-v4.2.x"],
   "chain-b": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
diff --git a/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-b.json
new file mode 100644
index 00000000000..49a78be62e4
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-b.json
@@ -0,0 +1,15 @@
+{
+  "chain-a": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1"],
+  "chain-b": ["release-v4.2.x"],
+  "entrypoint": ["TestIncentivizedTransferTestSuite"],
+  "test": [
+    "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",
+    "TestMsgPayPacketFee_InvalidReceiverAccount",
+    "TestMultiMsg_MsgPayPacketFeeSingleSender",
+    "TestMsgPayPacketFee_SingleSender_TimesOut",
+    "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress",
+    "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
+  ],
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v4.2.x/transfer.json b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json
similarity index 66%
rename from .github/compatibility-test-matrices/release-v4.2.x/transfer.json
rename to .github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json
index 95dbefc2dd1..260bc091444 100644
--- a/.github/compatibility-test-matrices/release-v4.2.x/transfer.json
+++ b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json
@@ -1,11 +1,14 @@
 {
-  "chain-a": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v4.2.x"],
   "chain-b": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
-    "TestMsgTransfer_Timeout_Nonincentivized"
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
+    "TestSendEnabledParam",
+    "TestReceiveEnabledParam"
   ],
   "chain-binary": ["simd"],
   "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
diff --git a/.github/compatibility-test-matrices/release-v4.2.x/transfer-params.json b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json
similarity index 59%
rename from .github/compatibility-test-matrices/release-v4.2.x/transfer-params.json
rename to .github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json
index 5e0ac361b86..69193d2fdae 100644
--- a/.github/compatibility-test-matrices/release-v4.2.x/transfer-params.json
+++ b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json
@@ -1,8 +1,12 @@
 {
   "chain-a": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v4.2.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
+    "TestMsgTransfer_Succeeds_Nonincentivized",
+    "TestMsgTransfer_Fails_InvalidAddress",
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
     "TestSendEnabledParam",
     "TestReceiveEnabledParam"
   ],
diff --git a/.github/compatibility-test-matrices/release-v4.2.x/transfer-memo.json b/.github/compatibility-test-matrices/release-v4.2.x/transfer-memo.json
deleted file mode 100644
index e65f46ea978..00000000000
--- a/.github/compatibility-test-matrices/release-v4.2.x/transfer-memo.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "chain-a": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v4.2.x", "v5.1.0", "v5.0.1", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "entrypoint": ["TestTransferTestSuite"],
-  "test": [
-    "TestMsgTransfer_WithMemo"
-  ],
-  "chain-binary": ["simd"],
-  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
-}
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/client.json b/.github/compatibility-test-matrices/release-v5.0.x/client-chain-a.json
similarity index 73%
rename from .github/compatibility-test-matrices/release-v5.0.x/client.json
rename to .github/compatibility-test-matrices/release-v5.0.x/client-chain-a.json
index cbfd796fefa..d75ee75115a 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/client.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/client-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v5.0.x"],
   "chain-b": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v5.0.x/client-chain-b.json
new file mode 100644
index 00000000000..0af707d78b6
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v5.0.x/client-chain-b.json
@@ -0,0 +1,10 @@
+{
+  "chain-a": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v5.0.x"],
+  "entrypoint": ["TestClientTestSuite"],
+  "test": [
+    "TestClientUpdateProposal_Succeeds"
+  ],
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/connection.json b/.github/compatibility-test-matrices/release-v5.0.x/connection-chain-a.json
similarity index 73%
rename from .github/compatibility-test-matrices/release-v5.0.x/connection.json
rename to .github/compatibility-test-matrices/release-v5.0.x/connection-chain-a.json
index ffe82297d23..1090f5ef391 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/connection.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/connection-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v5.0.x"],
   "chain-b": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v5.0.x/connection-chain-b.json
new file mode 100644
index 00000000000..dcfb168e0ba
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v5.0.x/connection-chain-b.json
@@ -0,0 +1,10 @@
+{
+  "chain-a": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v5.0.x"],
+  "entrypoint": ["TestConnectionTestSuite"],
+  "test": [
+    "TestMaxExpectedTimePerBlockParam"
+  ],
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer-chain-a.json
similarity index 89%
rename from .github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
rename to .github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer-chain-a.json
index f9ea2aaeaa0..bb910d4f907 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1"],
+  "chain-a": ["release-v5.0.x"],
   "chain-b": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer-chain-b.json
new file mode 100644
index 00000000000..70551e90d66
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer-chain-b.json
@@ -0,0 +1,15 @@
+{
+  "chain-a": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1"],
+  "chain-b": ["release-v5.0.x"],
+  "entrypoint": ["TestIncentivizedTransferTestSuite"],
+  "test": [
+    "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",
+    "TestMsgPayPacketFee_InvalidReceiverAccount",
+    "TestMultiMsg_MsgPayPacketFeeSingleSender",
+    "TestMsgPayPacketFee_SingleSender_TimesOut",
+    "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress",
+    "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
+  ],
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/transfer.json b/.github/compatibility-test-matrices/release-v5.0.x/transfer-chain-a.json
similarity index 69%
rename from .github/compatibility-test-matrices/release-v5.0.x/transfer.json
rename to .github/compatibility-test-matrices/release-v5.0.x/transfer-chain-a.json
index 83d1e6ef5d8..41d37591fd3 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/transfer.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/transfer-chain-a.json
@@ -1,11 +1,13 @@
 {
-  "chain-a": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v5.0.x"],
   "chain-b": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
-    "TestMsgTransfer_Timeout_Nonincentivized"
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestSendEnabledParam",
+    "TestReceiveEnabledParam"
   ],
   "chain-binary": ["simd"],
   "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/transfer-params.json b/.github/compatibility-test-matrices/release-v5.0.x/transfer-chain-b.json
similarity index 63%
rename from .github/compatibility-test-matrices/release-v5.0.x/transfer-params.json
rename to .github/compatibility-test-matrices/release-v5.0.x/transfer-chain-b.json
index c998bcb61b8..3bcbb0a49bc 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/transfer-params.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/transfer-chain-b.json
@@ -1,8 +1,11 @@
 {
   "chain-a": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v5.0.x", "v5.1.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v5.0.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
+    "TestMsgTransfer_Succeeds_Nonincentivized",
+    "TestMsgTransfer_Fails_InvalidAddress",
+    "TestMsgTransfer_Timeout_Nonincentivized",
     "TestSendEnabledParam",
     "TestReceiveEnabledParam"
   ],
diff --git a/.github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer.json b/.github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer-chain-a.json
similarity index 89%
rename from .github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer.json
rename to .github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer-chain-a.json
index edf28f844de..62a9663804d 100644
--- a/.github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer.json
+++ b/.github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1"],
+  "chain-a": ["release-v5.1.x"],
   "chain-b": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
diff --git a/.github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer-chain-b.json
new file mode 100644
index 00000000000..0b47967d388
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v5.1.x/incentivized-transfer-chain-b.json
@@ -0,0 +1,15 @@
+{
+  "chain-a": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1"],
+  "chain-b": ["release-v5.1.x"],
+  "entrypoint": ["TestIncentivizedTransferTestSuite"],
+  "test": [
+    "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",
+    "TestMsgPayPacketFee_InvalidReceiverAccount",
+    "TestMultiMsg_MsgPayPacketFeeSingleSender",
+    "TestMsgPayPacketFee_SingleSender_TimesOut",
+    "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress",
+    "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
+  ],
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v5.1.x/transfer.json b/.github/compatibility-test-matrices/release-v5.1.x/transfer-chain-a.json
similarity index 66%
rename from .github/compatibility-test-matrices/release-v5.1.x/transfer.json
rename to .github/compatibility-test-matrices/release-v5.1.x/transfer-chain-a.json
index d38e2fdf3a5..d1e0b88cc62 100644
--- a/.github/compatibility-test-matrices/release-v5.1.x/transfer.json
+++ b/.github/compatibility-test-matrices/release-v5.1.x/transfer-chain-a.json
@@ -1,11 +1,14 @@
 {
-  "chain-a": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v5.1.x"],
   "chain-b": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
-    "TestMsgTransfer_Timeout_Nonincentivized"
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
+    "TestSendEnabledParam",
+    "TestReceiveEnabledParam"
   ],
   "chain-binary": ["simd"],
   "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
diff --git a/.github/compatibility-test-matrices/release-v5.1.x/transfer-params.json b/.github/compatibility-test-matrices/release-v5.1.x/transfer-chain-b.json
similarity index 59%
rename from .github/compatibility-test-matrices/release-v5.1.x/transfer-params.json
rename to .github/compatibility-test-matrices/release-v5.1.x/transfer-chain-b.json
index fc03806033c..5582e6d300f 100644
--- a/.github/compatibility-test-matrices/release-v5.1.x/transfer-params.json
+++ b/.github/compatibility-test-matrices/release-v5.1.x/transfer-chain-b.json
@@ -1,11 +1,15 @@
 {
   "chain-a": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v5.1.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
+    "TestMsgTransfer_Succeeds_Nonincentivized",
+    "TestMsgTransfer_Fails_InvalidAddress",
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
     "TestSendEnabledParam",
     "TestReceiveEnabledParam"
   ],
   "chain-binary": ["simd"],
   "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
-}
\ No newline at end of file
+}
diff --git a/.github/compatibility-test-matrices/release-v5.1.x/transfer-memo.json b/.github/compatibility-test-matrices/release-v5.1.x/transfer-memo.json
deleted file mode 100644
index fdf47a97373..00000000000
--- a/.github/compatibility-test-matrices/release-v5.1.x/transfer-memo.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "chain-a": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v5.1.x", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "entrypoint": ["TestTransferTestSuite"],
-  "test": [
-    "TestMsgTransfer_WithMemo"
-  ],
-  "chain-binary": ["simd"],
-  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
-}
diff --git a/.github/compatibility-test-matrices/release-v6.0.x/client.json b/.github/compatibility-test-matrices/release-v6.0.x/client-chain-a.json
similarity index 72%
rename from .github/compatibility-test-matrices/release-v6.0.x/client.json
rename to .github/compatibility-test-matrices/release-v6.0.x/client-chain-a.json
index 93fbcc027f3..87d79b5ac0a 100644
--- a/.github/compatibility-test-matrices/release-v6.0.x/client.json
+++ b/.github/compatibility-test-matrices/release-v6.0.x/client-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v6.0.x"],
   "chain-b": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [
diff --git a/.github/compatibility-test-matrices/release-v6.0.x/transfer-memo.json b/.github/compatibility-test-matrices/release-v6.0.x/client-chain-b.json
similarity index 52%
rename from .github/compatibility-test-matrices/release-v6.0.x/transfer-memo.json
rename to .github/compatibility-test-matrices/release-v6.0.x/client-chain-b.json
index 44b2d6d982f..7d4ce6bb187 100644
--- a/.github/compatibility-test-matrices/release-v6.0.x/transfer-memo.json
+++ b/.github/compatibility-test-matrices/release-v6.0.x/client-chain-b.json
@@ -1,9 +1,9 @@
 {
   "chain-a": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "entrypoint": ["TestTransferTestSuite"],
+  "chain-b": ["release-v6.0.x"],
+  "entrypoint": ["TestClientTestSuite"],
   "test": [
-    "TestMsgTransfer_WithMemo"
+    "TestClientUpdateProposal_Succeeds"
   ],
   "chain-binary": ["simd"],
   "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
diff --git a/.github/compatibility-test-matrices/release-v6.0.x/connection.json b/.github/compatibility-test-matrices/release-v6.0.x/connection-chain-a.json
similarity index 72%
rename from .github/compatibility-test-matrices/release-v6.0.x/connection.json
rename to .github/compatibility-test-matrices/release-v6.0.x/connection-chain-a.json
index 9592bcf6977..0e98f98fef1 100644
--- a/.github/compatibility-test-matrices/release-v6.0.x/connection.json
+++ b/.github/compatibility-test-matrices/release-v6.0.x/connection-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v6.0.x"],
   "chain-b": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [
diff --git a/.github/compatibility-test-matrices/release-v6.0.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v6.0.x/connection-chain-b.json
new file mode 100644
index 00000000000..8ce0206e5c2
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v6.0.x/connection-chain-b.json
@@ -0,0 +1,10 @@
+{
+  "chain-a": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v6.0.x"],
+  "entrypoint": ["TestConnectionTestSuite"],
+  "test": [
+    "TestMaxExpectedTimePerBlockParam"
+  ],
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer.json b/.github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer-chain-a.json
similarity index 88%
rename from .github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer.json
rename to .github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer-chain-a.json
index e2794833c6c..58171d0556f 100644
--- a/.github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer.json
+++ b/.github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"],
+  "chain-a": ["release-v6.0.x"],
   "chain-b": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
diff --git a/.github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer-chain-b.json
new file mode 100644
index 00000000000..92c878dc74e
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v6.0.x/incentivized-transfer-chain-b.json
@@ -0,0 +1,15 @@
+{
+  "chain-a": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"],
+  "chain-b": ["release-v6.0.x"],
+  "entrypoint": ["TestIncentivizedTransferTestSuite"],
+  "test": [
+    "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",
+    "TestMsgPayPacketFee_InvalidReceiverAccount",
+    "TestMultiMsg_MsgPayPacketFeeSingleSender",
+    "TestMsgPayPacketFee_SingleSender_TimesOut",
+    "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress",
+    "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
+  ],
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v6.0.x/transfer.json b/.github/compatibility-test-matrices/release-v6.0.x/transfer-chain-a.json
similarity index 66%
rename from .github/compatibility-test-matrices/release-v6.0.x/transfer.json
rename to .github/compatibility-test-matrices/release-v6.0.x/transfer-chain-a.json
index 625bf833518..1816d85a31f 100644
--- a/.github/compatibility-test-matrices/release-v6.0.x/transfer.json
+++ b/.github/compatibility-test-matrices/release-v6.0.x/transfer-chain-a.json
@@ -1,11 +1,14 @@
 {
-  "chain-a": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v6.0.x"],
   "chain-b": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
-    "TestMsgTransfer_Timeout_Nonincentivized"
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
+    "TestSendEnabledParam",
+    "TestReceiveEnabledParam"
   ],
   "chain-binary": ["simd"],
   "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
diff --git a/.github/compatibility-test-matrices/release-v6.0.x/transfer-params.json b/.github/compatibility-test-matrices/release-v6.0.x/transfer-chain-b.json
similarity index 60%
rename from .github/compatibility-test-matrices/release-v6.0.x/transfer-params.json
rename to .github/compatibility-test-matrices/release-v6.0.x/transfer-chain-b.json
index bec58e4cf78..5c9fb03ec13 100644
--- a/.github/compatibility-test-matrices/release-v6.0.x/transfer-params.json
+++ b/.github/compatibility-test-matrices/release-v6.0.x/transfer-chain-b.json
@@ -1,8 +1,12 @@
 {
   "chain-a": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
-  "chain-b": ["release-v6.0.x", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v6.0.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
+    "TestMsgTransfer_Succeeds_Nonincentivized",
+    "TestMsgTransfer_Fails_InvalidAddress",
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestMsgTransfer_WithMemo",
     "TestSendEnabledParam",
     "TestReceiveEnabledParam"
   ],

From 716d02108f238b2f0ce7b199c019456ba7678c6a Mon Sep 17 00:00:00 2001
From: Carlos Rodriguez <crodveg@gmail.com>
Date: Thu, 17 Nov 2022 12:05:34 +0100
Subject: [PATCH 2/6] add separate workflow to run unreleased compatibility
 tests

---
 .../e2e-compatibility-unreleased.yaml         | 106 ++++++++++++++++++
 .github/workflows/e2e-compatibility.yaml      |  75 ++++++++-----
 2 files changed, 156 insertions(+), 25 deletions(-)
 create mode 100644 .github/workflows/e2e-compatibility-unreleased.yaml

diff --git a/.github/workflows/e2e-compatibility-unreleased.yaml b/.github/workflows/e2e-compatibility-unreleased.yaml
new file mode 100644
index 00000000000..fee68c8913c
--- /dev/null
+++ b/.github/workflows/e2e-compatibility-unreleased.yaml
@@ -0,0 +1,106 @@
+name: Compatibility E2E
+on:
+  workflow_dispatch:
+    inputs:
+      release-branch:
+        description: 'Select unreleased to run all release branches against each other'
+        required: true
+        type: choice
+        options:
+          - unreleased
+
+env:
+  REGISTRY: ghcr.io
+  ORG: cosmos
+  IMAGE_NAME: ibc-go-simd
+  RELEASE_BRANCH: '${{ inputs.release-branch }}'
+
+jobs:
+  determine-test-directory:
+    runs-on: ubuntu-latest
+    outputs:
+      test-directory: ${{ steps.set-test-dir.outputs.test-directory }}
+    steps:
+      - run: |
+          test_dir="$(echo $RELEASE_BRANCH | sed 's/\//-/')"
+          echo $test_dir
+          echo "::set-output name=test-directory::$test_dir"
+        id: set-test-dir
+
+  # build-release-images builds all docker images that are relevant for the compatibility tests. If a single release
+  # branch is specified, only that image will be built, e.g. release-v6.0.x but if 'unreleased' is specified
+  # every image will be built.
+  build-release-images:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        release-branch:
+          - release/v2.5.x
+          - release/v3.4.x
+          - release/v4.2.x
+          - release/v5.0.x
+          - release/v5.1.x
+          - release/v6.0.x
+    steps:
+      - uses: actions/checkout@v3
+        if: env.RELEASE_BRANCH == 'unreleased'
+        with:
+          ref: "${{ matrix.release-branch }}"
+          fetch-depth: 0
+      - name: Log in to the Container registry
+        if: env.RELEASE_BRANCH == 'unreleased'
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Fetch Makefile dependencies
+        if: env.RELEASE_BRANCH == 'unreleased'
+        run: |
+          mkdir -p contrib/devtools
+          curl https://raw.githubusercontent.com/cosmos/ibc-go/main/contrib/devtools/Makefile -o contrib/devtools/Makefile
+      - name: Fetch latest Dockerfile
+        if: env.RELEASE_BRANCH == 'unreleased'
+        run: curl https://raw.githubusercontent.com/cosmos/ibc-go/main/Dockerfile -o Dockerfile
+      - name: Build image
+        if: env.RELEASE_BRANCH == 'unreleased'
+        run: |
+          docker_tag="$(echo ${{ matrix.release-branch }} | sed 's/\//-/')"
+          docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:$docker_tag"
+          docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:$docker_tag"
+
+  transfer:
+    needs:
+      - build-release-images
+      - determine-test-directory
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "transfer"
+
+  connection:
+    needs:
+      - build-release-images
+      - determine-test-directory
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "connection"
+
+  client:
+    needs:
+      - build-release-images
+      - determine-test-directory
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "client"
+
+  incentivized-transfer:
+    needs:
+      - build-release-images
+      - determine-test-directory
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "incentivized-transfer-chain-a"
\ No newline at end of file
diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index 950ed677cd0..16e946e3055 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
     inputs:
       release-branch:
-        description: 'Release branch to test (unreleased to run all release branches against each other)'
+        description: 'Release branch to test'
         required: true
         type: choice
         options:
@@ -13,7 +13,6 @@ on:
           - release/v5.0.x
           - release/v5.1.x
           - release/v6.0.x
-          - unreleased
 
 env:
   REGISTRY: ghcr.io
@@ -34,8 +33,7 @@ jobs:
         id: set-test-dir
 
   # build-release-images builds all docker images that are relevant for the compatibility tests. If a single release
-  # branch is specified, only that image will be built, e.g. release-v6.0.x but if 'unreleased' is specified
-  # every image will be built.
+  # branch is specified, only that image will be built, e.g. release-v6.0.x.
   build-release-images:
     runs-on: ubuntu-latest
     strategy:
@@ -49,73 +47,100 @@ jobs:
           - release/v6.0.x
     steps:
       - uses: actions/checkout@v3
-        if: env.RELEASE_BRANCH == 'unreleased' || env.RELEASE_BRANCH == matrix.release-branch
+        if: env.RELEASE_BRANCH == matrix.release-branch
         with:
           ref: "${{ matrix.release-branch }}"
           fetch-depth: 0
       - name: Log in to the Container registry
-        if: env.RELEASE_BRANCH == 'unreleased' || env.RELEASE_BRANCH == matrix.release-branch
+        if: env.RELEASE_BRANCH == matrix.release-branch
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Fetch Makefile dependencies
-        if: env.RELEASE_BRANCH == 'unreleased' || env.RELEASE_BRANCH == matrix.release-branch
+        if: env.RELEASE_BRANCH == matrix.release-branch
         run: |
           mkdir -p contrib/devtools
           curl https://raw.githubusercontent.com/cosmos/ibc-go/main/contrib/devtools/Makefile -o contrib/devtools/Makefile
       - name: Fetch latest Dockerfile
-        if: env.RELEASE_BRANCH == 'unreleased' || env.RELEASE_BRANCH == matrix.release-branch
+        if: env.RELEASE_BRANCH == matrix.release-branch
         run: curl https://raw.githubusercontent.com/cosmos/ibc-go/main/Dockerfile -o Dockerfile
       - name: Build image
-        if: env.RELEASE_BRANCH == 'unreleased' || env.RELEASE_BRANCH == matrix.release-branch
+        if: env.RELEASE_BRANCH == matrix.release-branch
         run: |
           docker_tag="$(echo ${{ matrix.release-branch }} | sed 's/\//-/')"
           docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:$docker_tag"
           docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:$docker_tag"
 
-  transfer:
+  transfer-chain-a:
     needs:
       - build-release-images
       - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
       test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
-      test-suite: "transfer"
+      test-suite: "transfer-chain-a"
 
-  transfer-params:
+  transfer-chain-b:
     needs:
-      - build-release-image
-      - determine-docker-tag
+      - build-release-images
+      - determine-test-directory
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "transfer-chain-b"
+
+  connection-chain-a:
+    needs:
+      - build-release-images
+      - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
-      docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
-      test-suite: "transfer-params"
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "connection-chain-a"
 
-  transfer-memo:
+  connection-chain-b:
     needs:
-      - build-release-image
-      - determine-docker-tag
+      - build-release-images
+      - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
-      docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
-      test-suite: "transfer-memo"
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "connection-chain-b"
+
+  client-chain-a:
+    needs:
+      - build-release-images
+      - determine-test-directory
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "client-chain-a"
+
+  client-chain-b:
+    needs:
+      - build-release-images
+      - determine-test-directory
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-suite: "client-chain-b"
 
-  client:
+  incentivized-transfer-chain-a:
     needs:
       - build-release-images
       - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
       test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
-      test-suite: "client"
+      test-suite: "incentivized-transfer-chain-a"
 
-  incentivized-transfer:
+  incentivized-transfer-chain-b:
     needs:
       - build-release-images
       - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
       test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
-      test-suite: "incentivized-transfer"
+      test-suite: "incentivized-transfer-chain-b"
\ No newline at end of file

From d6e60c35e8225e48b63fd845b0478aed50db1c05 Mon Sep 17 00:00:00 2001
From: Carlos Rodriguez <crodveg@gmail.com>
Date: Thu, 17 Nov 2022 12:22:51 +0100
Subject: [PATCH 3/6] review comments

---
 .../e2e-compatibility-unreleased.yaml         | 67 ++-----------------
 1 file changed, 5 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/e2e-compatibility-unreleased.yaml b/.github/workflows/e2e-compatibility-unreleased.yaml
index fee68c8913c..2f8ec0e6993 100644
--- a/.github/workflows/e2e-compatibility-unreleased.yaml
+++ b/.github/workflows/e2e-compatibility-unreleased.yaml
@@ -16,91 +16,34 @@ env:
   RELEASE_BRANCH: '${{ inputs.release-branch }}'
 
 jobs:
-  determine-test-directory:
-    runs-on: ubuntu-latest
-    outputs:
-      test-directory: ${{ steps.set-test-dir.outputs.test-directory }}
-    steps:
-      - run: |
-          test_dir="$(echo $RELEASE_BRANCH | sed 's/\//-/')"
-          echo $test_dir
-          echo "::set-output name=test-directory::$test_dir"
-        id: set-test-dir
-
-  # build-release-images builds all docker images that are relevant for the compatibility tests. If a single release
-  # branch is specified, only that image will be built, e.g. release-v6.0.x but if 'unreleased' is specified
-  # every image will be built.
-  build-release-images:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        release-branch:
-          - release/v2.5.x
-          - release/v3.4.x
-          - release/v4.2.x
-          - release/v5.0.x
-          - release/v5.1.x
-          - release/v6.0.x
-    steps:
-      - uses: actions/checkout@v3
-        if: env.RELEASE_BRANCH == 'unreleased'
-        with:
-          ref: "${{ matrix.release-branch }}"
-          fetch-depth: 0
-      - name: Log in to the Container registry
-        if: env.RELEASE_BRANCH == 'unreleased'
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch Makefile dependencies
-        if: env.RELEASE_BRANCH == 'unreleased'
-        run: |
-          mkdir -p contrib/devtools
-          curl https://raw.githubusercontent.com/cosmos/ibc-go/main/contrib/devtools/Makefile -o contrib/devtools/Makefile
-      - name: Fetch latest Dockerfile
-        if: env.RELEASE_BRANCH == 'unreleased'
-        run: curl https://raw.githubusercontent.com/cosmos/ibc-go/main/Dockerfile -o Dockerfile
-      - name: Build image
-        if: env.RELEASE_BRANCH == 'unreleased'
-        run: |
-          docker_tag="$(echo ${{ matrix.release-branch }} | sed 's/\//-/')"
-          docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:$docker_tag"
-          docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:$docker_tag"
-
   transfer:
     needs:
       - build-release-images
-      - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
-      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-file-directory: "unreleased"
       test-suite: "transfer"
 
   connection:
     needs:
       - build-release-images
-      - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
-      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-file-directory: "unreleased"
       test-suite: "connection"
 
   client:
     needs:
       - build-release-images
-      - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
-      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
+      test-file-directory: "unreleased"
       test-suite: "client"
 
   incentivized-transfer:
     needs:
       - build-release-images
-      - determine-test-directory
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
-      test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}"
-      test-suite: "incentivized-transfer-chain-a"
\ No newline at end of file
+      test-file-directory: "unreleased"
+      test-suite: "incentivized-transfer"
\ No newline at end of file

From a5f01510c4b7736e7fcbc7c1337dbbe1e98066a0 Mon Sep 17 00:00:00 2001
From: Carlos Rodriguez <crodveg@gmail.com>
Date: Thu, 17 Nov 2022 12:23:45 +0100
Subject: [PATCH 4/6] skip missing json files

---
 .github/workflows/e2e-compatibility-workflow-call.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml
index 2c141c5b028..b72090f2191 100644
--- a/.github/workflows/e2e-compatibility-workflow-call.yaml
+++ b/.github/workflows/e2e-compatibility-workflow-call.yaml
@@ -18,6 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: andstor/file-existence-action@v2
+        with:
+          files: "*.json"
       - run: |
           # use jq -c to put the full json contents on a single line. This is required when using the json body
           # to create the matrix in the following job.

From e44532562d87fabf3578e7416ff28a685b2246b9 Mon Sep 17 00:00:00 2001
From: Carlos Rodriguez <crodveg@gmail.com>
Date: Thu, 17 Nov 2022 12:24:20 +0100
Subject: [PATCH 5/6] fix condition for skipping missing json files

---
 .github/workflows/e2e-compatibility-workflow-call.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml
index b72090f2191..dbe6194240f 100644
--- a/.github/workflows/e2e-compatibility-workflow-call.yaml
+++ b/.github/workflows/e2e-compatibility-workflow-call.yaml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: andstor/file-existence-action@v2
         with:
-          files: "*.json"
+          files: ".github/compatibility-test-matrices/${{ inputs.test-file-directory }}/${{ inputs.test-suite }}.json"
       - run: |
           # use jq -c to put the full json contents on a single line. This is required when using the json body
           # to create the matrix in the following job.

From bf1d7d9fc5fcbb8420b7879f4dcf8780fec130b2 Mon Sep 17 00:00:00 2001
From: Carlos Rodriguez <crodveg@gmail.com>
Date: Thu, 17 Nov 2022 13:03:22 +0100
Subject: [PATCH 6/6] rename workflow

---
 .github/workflows/e2e-compatibility-unreleased.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-compatibility-unreleased.yaml b/.github/workflows/e2e-compatibility-unreleased.yaml
index 2f8ec0e6993..19be796dd9f 100644
--- a/.github/workflows/e2e-compatibility-unreleased.yaml
+++ b/.github/workflows/e2e-compatibility-unreleased.yaml
@@ -1,4 +1,4 @@
-name: Compatibility E2E
+name: Compatibility E2E (Unreleased)
 on:
   workflow_dispatch:
     inputs: