chore: Use latest Python code in Java Integration Tests (feast-dev#2645)

pyalex · web-flow · commit 41a1da4560bb · 2022-05-05T15:49:40.000-07:00
* Use latest python code in Java IT

Signed-off-by: pyalex &lt;moskalenko.alexey@gmail.com&gt;

* clean

Signed-off-by: pyalex &lt;moskalenko.alexey@gmail.com&gt;
diff --git a/java/serving/src/test/java/feast/serving/it/ServingEnvironment.java b/java/serving/src/test/java/feast/serving/it/ServingEnvironment.java
@@ -33,13 +33,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.testcontainers.containers.DockerComposeContainer;
-import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -60,9 +60,9 @@ static void globalSetup() {
         new DockerComposeContainer(
                 new File("src/test/resources/docker-compose/docker-compose-redis-it.yml"))
             .withExposedService("redis", 6379)
-            .withExposedService("feast", 8080)
-            .waitingFor("feast", Wait.forListeningPort())
-            .withLogConsumer("feast", f -> System.out.print(((OutputFrame) f).getUtf8String()));
+            .withExposedService(
+                "feast", 8080, Wait.forListeningPort().withStartupTimeout(Duration.ofSeconds(180)))
+            .withTailChildContainers(true);
     environment.start();
   }
 
diff --git a/java/serving/src/test/resources/docker-compose/docker-compose-redis-it.yml b/java/serving/src/test/resources/docker-compose/docker-compose-redis-it.yml
@@ -12,4 +12,6 @@ services:
       - "8080"
     links:
       - redis
+    volumes:
+      - $PWD/../../../../../../:/mnt/feast
 
diff --git a/java/serving/src/test/resources/docker-compose/feast10/Dockerfile b/java/serving/src/test/resources/docker-compose/feast10/Dockerfile
@@ -5,11 +5,8 @@ WORKDIR /usr/src/
 COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
 
-RUN git clone https://github.com/feast-dev/feast.git /root/feast
-RUN cd /root/feast/ && pip install -e '.[redis]'
-
 WORKDIR /app
 COPY . .
 EXPOSE 8080
 
-CMD ["/bin/sh", "-c", "python materialize.py && feast serve_transformations --port 8080"]
+CMD ["./entrypoint.sh"]
diff --git a/java/serving/src/test/resources/docker-compose/feast10/entrypoint.sh b/java/serving/src/test/resources/docker-compose/feast10/entrypoint.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+set -e
+
+# feast root directory is expected to be mounted (eg, by docker compose)
+cd /mnt/feast
+pip install -e '.[redis]'
+
+cd /app
+python materialize.py
+feast serve_transformations --port 8080
