CR feedback

apache · Oct 4, 2024 · 30b5271 · 30b5271
1 parent 6a4cff8
commit 30b5271
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml
@@ -651,18 +651,6 @@ jobs:
         run: |
           $GITHUB_WORKSPACE/build/pulsar_ci_tool.sh docker_load_image_from_github_actions_artifacts pulsar-java-test-image
 
-      - name: Pull apachepulsar/pulsar:2.10.6
-        run: |
-          docker pull apachepulsar/pulsar:2.10.6
-
-      - name: Pull apachepulsar/pulsar:3.0.5
-        run: |
-          docker pull apachepulsar/pulsar:3.0.5
-
-      - name: Pull alpine:3.20.1
-        run: |
-          docker pull alpine:3.20.1
-
       - name: Run setup commands
         if: ${{ matrix.setup }}
         run: |

diff --git a/...gration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java b/...gration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
@@ -51,8 +51,13 @@ public abstract class PulsarContainer<SelfT extends PulsarContainer<SelfT>> exte
     public static final int BROKER_HTTP_PORT = 8080;
     public static final int BROKER_HTTPS_PORT = 8081;
 
+    public static final String ALPINE_IMAGE_NAME = "alpine:3.20";
     public static final String DEFAULT_IMAGE_NAME = System.getenv().getOrDefault("PULSAR_TEST_IMAGE_NAME",
             "apachepulsar/pulsar-test-latest-version:latest");
+    public static final String UPGRADE_TEST_IMAGE_NAME = System.getenv().getOrDefault("PULSAR_UPGRADE_TEST_IMAGE_NAME",
+            DEFAULT_IMAGE_NAME);
+    public static final String LAST_RELEASE_IMAGE_NAME = System.getenv().getOrDefault("PULSAR_LAST_RELEASE_IMAGE_NAME",
+            "apachepulsar/pulsar:3.0.7");
     public static final String DEFAULT_HTTP_PATH = "/metrics";
     public static final String PULSAR_2_5_IMAGE_NAME = "apachepulsar/pulsar:2.5.0";
     public static final String PULSAR_2_4_IMAGE_NAME = "apachepulsar/pulsar:2.4.0";

diff --git a/...src/test/java/org/apache/pulsar/tests/integration/upgrade/PulsarUpgradeDowngradeTest.java b/...src/test/java/org/apache/pulsar/tests/integration/upgrade/PulsarUpgradeDowngradeTest.java
@@ -46,13 +46,8 @@
 public class PulsarUpgradeDowngradeTest extends PulsarClusterTestBase {
 
     @Test(timeOut=600_000)
-    public void upgradeFrom_2_10_6() throws Exception {
-        testUpgradeDowngrade("apachepulsar/pulsar:2.10.6", PulsarContainer.DEFAULT_IMAGE_NAME);
-    }
-
-    @Test(timeOut=600_000)
-    public void upgradeFrom_3_0_5() throws Exception {
-        testUpgradeDowngrade("apachepulsar/pulsar:3.0.5", PulsarContainer.DEFAULT_IMAGE_NAME);
+    public void upgradeTest() throws Exception {
+        testUpgradeDowngrade(PulsarContainer.LAST_RELEASE_IMAGE_NAME, PulsarContainer.UPGRADE_TEST_IMAGE_NAME);
     }
 
     private void testUpgradeDowngrade(String imageOld, String imageNew) throws Exception {
@@ -64,7 +59,7 @@ private void testUpgradeDowngrade(String imageOld, String imageNew) throws Excep
         @Cleanup
         Network network = Network.newNetwork();
         @Cleanup
-        GenericContainer<?> alpine = new GenericContainer<>("alpine:3.20.1")
+        GenericContainer<?> alpine = new GenericContainer<>(PulsarContainer.ALPINE_IMAGE_NAME)
                 .withExposedPorts(80)
                 .withNetwork(network)
                 .withNetworkAliases("shared-storage")