From 8e7050937bb7ef494165940543cb46411d687221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Thu, 24 Mar 2022 15:47:15 +0100
Subject: [PATCH] Add Docker images for Dataflow UC1 and UC3
---
.gitlab-ci.yml | 14 ++++++++++++++
theodolite-benchmarks/uc1-beam-dataflow/Dockerfile | 8 ++------
theodolite-benchmarks/uc3-beam-dataflow/Dockerfile | 7 ++-----
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc590f029..a0c372884 100644
--- a/.gitlab-ci.yml
+++ b/.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:
diff --git a/theodolite-benchmarks/uc1-beam-dataflow/Dockerfile b/theodolite-benchmarks/uc1-beam-dataflow/Dockerfile
index cf6ef6675..da250815f 100644
--- a/theodolite-benchmarks/uc1-beam-dataflow/Dockerfile
+++ b/theodolite-benchmarks/uc1-beam-dataflow/Dockerfile
@@ -1,9 +1,5 @@
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
diff --git a/theodolite-benchmarks/uc3-beam-dataflow/Dockerfile b/theodolite-benchmarks/uc3-beam-dataflow/Dockerfile
index 54979b8e1..3077c991c 100644
--- a/theodolite-benchmarks/uc3-beam-dataflow/Dockerfile
+++ b/theodolite-benchmarks/uc3-beam-dataflow/Dockerfile
@@ -1,8 +1,5 @@
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
--
GitLab