test(ors-test-scenarios): Test different pull workflow

GIScience · Nov 12, 2024 · 86f5834 · 86f5834
1 parent 469480a
commit 86f5834
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/ors-test-scenarios/src/test/java/utils/ContainerInitializer.java b/ors-test-scenarios/src/test/java/utils/ContainerInitializer.java
@@ -160,7 +160,6 @@ public static GenericContainer<?> initContainer(ContainerTestImage containerTest
                 .withStartupTimeout(startupTimeout)
                 .waitingFor(healthyOrsWaitStrategy());
         // @formatter:on
-        container.setDockerImageName(containerTestImage.getName());
         if (containerTestImage == ContainerTestImageBare.WAR_CONTAINER_BARE) {
             container.withEnv(defaultEnvWarBare);
         }

diff --git a/ors-test-scenarios/src/test/java/utils/OneShotImageBuilderTest.java b/ors-test-scenarios/src/test/java/utils/OneShotImageBuilderTest.java
@@ -24,9 +24,18 @@ class OneShotImageBuilderTest {
 
     @Test
     void oneShotImageBuilder() {
-        GenericContainer<?> containerWar = initContainerWithSharedGraphs(ContainerInitializer.ContainerTestImageBare.WAR_CONTAINER_BARE, false);
-        containerWar.setWaitStrategy(new ShellStrategy());
-        containerWar.start();
+        GenericContainer<?> containerWar;
+        try {
+            containerWar = initContainerWithSharedGraphs(ContainerInitializer.ContainerTestImageBare.WAR_CONTAINER_BARE, false);
+            containerWar.setWaitStrategy(new ShellStrategy());
+            containerWar.setDockerImageName(ContainerInitializer.ContainerTestImageBare.WAR_CONTAINER_BARE.getName());
+            containerWar.start();
+        } catch (Exception e) {
+            containerWar = initContainerWithSharedGraphs(ContainerInitializer.ContainerTestImageBare.WAR_CONTAINER_BARE, false);
+            containerWar.setWaitStrategy(new ShellStrategy());
+            containerWar.start();
+        }
+
         Assertions.assertTrue(containerWar.isRunning());
         containerWar.stop();
     }