From 588fe38830ea33ae5d467695f5178c87b18cc916 Mon Sep 17 00:00:00 2001 From: Fabio Massimo Ercoli Date: Wed, 8 Jan 2025 13:35:48 +0100 Subject: [PATCH 1/2] [#2194] Fix hr rolling upgrades action name --- .github/workflows/test_hr_rolling_upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_hr_rolling_upgrades.yml b/.github/workflows/test_hr_rolling_upgrades.yml index 36ba5c30b..3d62e834a 100644 --- a/.github/workflows/test_hr_rolling_upgrades.yml +++ b/.github/workflows/test_hr_rolling_upgrades.yml @@ -26,7 +26,7 @@ jobs: uses: ./.github/actions/kind - name: Run Hot Rod Rolling Upgrade Tests - run: make upgrade-test + run: make hotrod-upgrade-test env: SUBSCRIPTION_STARTING_CSV: infinispan-operator.v2.3.2 TESTING_OPERAND_IGNORE_LIST: ${{ inputs.skipList }} From 281128e0c1f5d4d59bd470f2a8964d0f0c8e627d Mon Sep 17 00:00:00 2001 From: Fabio Massimo Ercoli Date: Thu, 9 Jan 2025 15:23:27 +0100 Subject: [PATCH 2/2] [#2194] Limit CPU req to start pod for hrru --- .github/workflows/test_hr_rolling_upgrades.yml | 1 + test/e2e/hotrod-rolling-upgrade/hotrod_rolling_upgrade_test.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_hr_rolling_upgrades.yml b/.github/workflows/test_hr_rolling_upgrades.yml index 3d62e834a..52d4f99bc 100644 --- a/.github/workflows/test_hr_rolling_upgrades.yml +++ b/.github/workflows/test_hr_rolling_upgrades.yml @@ -30,6 +30,7 @@ jobs: env: SUBSCRIPTION_STARTING_CSV: infinispan-operator.v2.3.2 TESTING_OPERAND_IGNORE_LIST: ${{ inputs.skipList }} + INFINISPAN_CPU: 500m # prevent insufficient cpu error on test-rolling-upgrade pod start - name: Inspect Cluster if: failure() diff --git a/test/e2e/hotrod-rolling-upgrade/hotrod_rolling_upgrade_test.go b/test/e2e/hotrod-rolling-upgrade/hotrod_rolling_upgrade_test.go index 4477377c8..995415781 100644 --- a/test/e2e/hotrod-rolling-upgrade/hotrod_rolling_upgrade_test.go +++ b/test/e2e/hotrod-rolling-upgrade/hotrod_rolling_upgrade_test.go @@ -71,7 +71,6 @@ func TestRollingUpgrade(t *testing.T) { entriesPerCache := 100 spec := tutils.DefaultSpec(t, testKube, func(i *ispnv1.Infinispan) { i.Spec.Replicas = int32(replicas) - i.Spec.Container.CPU = "1000m" i.Spec.Service.Container.EphemeralStorage = false i.Spec.Upgrades = &ispnv1.InfinispanUpgradesSpec{ Type: ispnv1.UpgradeTypeHotRodRolling,