Merge branch 'master' into dmivankov-patch-4

cognitedata · Oct 16, 2023 · c21a310 · c21a310
2 parents 748feb5 + 29e8e59
commit c21a310
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 208 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -70,7 +70,6 @@ jobs:
           if [ ${{github.ref }} == "refs/heads/master" ]; then
             LIB_PACKAGE="+fatJarShaded/assembly"
           fi
-          sbt -Dsbt.log.noformat=true "set library/test := {}" $LIB_PACKAGE performancebench/docker:stage
       - name: Deploy JAR
         if: github.ref == 'refs/heads/master'
         env:

diff --git a/build.sbt b/build.sbt
@@ -159,31 +159,6 @@ lazy val library = (project in file("."))
     buildInfoPackage := "cognite.spark.cdf_spark_datasource"
   )
 
-lazy val performancebench = (project in file("performancebench"))
-  .enablePlugins(JavaAppPackaging, UniversalPlugin, DockerPlugin)
-  .dependsOn(library)
-  .settings(
-    commonSettings,
-    publish / skip := true,
-    name := "cdf-spark-performance-bench",
-    fork := true,
-    libraryDependencies ++= Seq(
-      "io.prometheus" % "simpleclient" % prometheusVersion,
-      "io.prometheus" % "simpleclient_httpserver" % prometheusVersion,
-      "io.prometheus" % "simpleclient_hotspot" % prometheusVersion,
-      "org.log4s" %% "log4s" % log4sVersion,
-      "org.apache.spark" %% "spark-core" % sparkVersion
-        exclude("org.glassfish.hk2.external", "javax.inject"),
-      "org.apache.spark" %% "spark-sql" % sparkVersion
-        exclude("org.glassfish.hk2.external", "javax.inject"),
-    ),
-    dockerBaseImage := "eu.gcr.io/cognitedata/cognite-jre:8-slim",
-    dockerCommands ++= Seq(
-      Cmd("ENV", s"JAVA_MAIN_CLASS=${(Compile / mainClass).value.get}"),
-      Cmd("ENV", "JAVA_APP_DIR=/opt/docker/lib")
-    ),
-  )
-
 lazy val fatJarShaded = project
   .enablePlugins(AssemblyPlugin)
   .dependsOn(library)

diff --git a/performancebench/src/main/resources/log4j.properties b/performancebench/src/main/resources/log4j.properties
diff --git a/performancebench/src/main/scala/cognite/spark/performancebench/EventPerformance.scala b/performancebench/src/main/scala/cognite/spark/performancebench/EventPerformance.scala
diff --git a/performancebench/src/main/scala/cognite/spark/performancebench/Main.scala b/performancebench/src/main/scala/cognite/spark/performancebench/Main.scala
diff --git a/performancebench/src/main/scala/cognite/spark/performancebench/Metrics.scala b/performancebench/src/main/scala/cognite/spark/performancebench/Metrics.scala
diff --git a/performancebench/src/main/scala/cognite/spark/performancebench/PerformanceSuite.scala b/performancebench/src/main/scala/cognite/spark/performancebench/PerformanceSuite.scala
diff --git a/performancebench/src/main/scala/cognite/spark/performancebench/SparkUtil.scala b/performancebench/src/main/scala/cognite/spark/performancebench/SparkUtil.scala
diff --git a/performancebench/src/main/scala/cognite/spark/performancebench/Warmup.scala b/performancebench/src/main/scala/cognite/spark/performancebench/Warmup.scala
diff --git a/src/main/scripts/Pipfile.lock b/src/main/scripts/Pipfile.lock