Merge branch 'beam-dataflow' into firestore-test

.gitlab-ci.yml

@@ -353,6 +353,20 @@ deploy-uc4-beam-samza:
     JAVA_PROJECT_NAME: "uc4-beam-samza"
     JAVA_PROJECT_DEPS: "beam-commons,uc4-beam"
 
+deploy-uc1-beam-dataflow:
+  extends: .deploy-benchmarks
+  variables:
+    IMAGE_NAME: "theodolite-uc1-beam-dataflow"
+    JAVA_PROJECT_NAME: "uc1-beam-dataflow"
+    JAVA_PROJECT_DEPS: "beam-commons,uc1-beam"
+
+deploy-uc3-beam-dataflow:
+  extends: .deploy-benchmarks
+  variables:
+    IMAGE_NAME: "theodolite-uc3-beam-dataflow"
+    JAVA_PROJECT_NAME: "uc3-beam-dataflow"
+    JAVA_PROJECT_DEPS: "beam-commons,uc3-beam"
+
 deploy-uc1-load-generator:
   extends: .deploy-benchmarks
   variables:

theodolite-benchmarks/uc1-beam-dataflow/Dockerfile

 FROM openjdk:11-slim
 
-ENV MAX_SOURCE_PARALLELISM=1024
-
-ADD build/distributions/uc1-beam-samza.tar /
-ADD samza-standalone.properties /
-
-CMD /uc1-beam-samza/bin/uc1-beam-samza --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
+ADD build/distributions/uc1-beam-dataflow.tar /
 
+CMD /uc1-beam-dataflow/bin/uc1-beam-dataflow

theodolite-benchmarks/uc3-beam-dataflow/Dockerfile

 FROM openjdk:11-slim
 
-ENV MAX_SOURCE_PARALLELISM=1024
+ADD build/distributions/uc3-beam-dataflow.tar /
 
-ADD build/distributions/uc3-beam-samza.tar /
-ADD samza-standalone.properties /
-
-CMD /uc3-beam-samza/bin/uc3-beam-samza --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
+CMD /uc3-beam-dataflow/bin/uc3-beam-dataflow