Skip to content

Commit f291f23

Browse files
committed
Revert "Start upgrade tests on Infinispan 14.0.22 or greater to prevent https://issues.redhat.com/browse/ISPN-15191"
This reverts commit 424aa53.
1 parent 424aa53 commit f291f23

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/test_hr_rolling_upgrades.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Run Hot Rod Rolling Upgrade Tests
2929
run: make hotrod-upgrade-test
3030
env:
31-
SUBSCRIPTION_STARTING_CSV: infinispan-operator.v2.3.7
31+
SUBSCRIPTION_STARTING_CSV: infinispan-operator.v2.3.2
3232
TESTING_OPERAND_IGNORE_LIST: ${{ inputs.skipList }}
3333
INFINISPAN_CPU: 500m # prevent insufficient cpu error on test-rolling-upgrade pod start
3434

.github/workflows/test_upgrades.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ jobs:
125125
exit 1
126126
fi
127127
else
128-
# Start on at least 2.3.7 as we need to start on a server version greater than 14.0.22.Final to prevent
129-
# the internal .LOCKS cache remaining DEGRADED indefinitely https://issues.redhat.com/browse/ISPN-15191
130-
export SUBSCRIPTION_STARTING_CSV=infinispan-operator.v2.3.7
128+
export SUBSCRIPTION_STARTING_CSV=infinispan-operator.v2.3.2
131129
fi
132130
make upgrade-test
133131
env:

test/e2e/upgrade/upgrade_operands_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ func TestOperandUpgrades(t *testing.T) {
3131

3232
startingOperandIdx := -1
3333
for i, op := range versionManager.Operands {
34-
// We must start on a server version greater than 14.0.22.Final to prevent
35-
// the internal .LOCKS cache remaining DEGRADED indefinitely https://issues.redhat.com/browse/ISPN-15191
36-
if op.UpstreamVersion.Major == 14 && op.UpstreamVersion.Patch >= 22 || op.UpstreamVersion.Major > 14 {
34+
// We must start at Infinispan 14.0.8 or higher due to ISPN-12224
35+
if (op.UpstreamVersion.Major == 14 && op.UpstreamVersion.Patch >= 8) || op.UpstreamVersion.Major > 14 {
3736
startingOperandIdx = i
3837
break
3938
}

0 commit comments

Comments
 (0)