rolling-update-kubernetes/it now in integration-test/rolling-update-k…

…ubernetes-cr
akka · Dec 15, 2023 · 3ff9a3a · 3ff9a3a
1 parent 6a49c2c
commit 3ff9a3a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/.github/workflows/integration-tests-rollingupdate-cr.yml b/.github/workflows/integration-tests-rollingupdate-cr.yml
@@ -60,7 +60,7 @@ jobs:
           echo 'Adding proxy port'
           kubectl proxy --port=8080 &
           echo 'Running tests'
-          sbt "rolling-update-kubernetes/IntegrationTest/test"
+          sbt "integration-tests-rolling-update-kubernetes-cr/test"
           ./integration-test/rollingupdate-kubernetes/test-cr.sh
 
       - name: Print logs on failure

diff --git a/build.sbt b/build.sbt
@@ -182,11 +182,18 @@ lazy val `rolling-update-kubernetes` = project
     libraryDependencies := Dependencies.RollingUpdateKubernetes,
     mimaPreviousArtifacts := Set.empty
   )
+  .dependsOn(`akka-management-pki`)
+
+lazy val `integration-tests-rolling-update-kubernetes-cr` = project
+  .in(file("integration-tests/rolling-update-kubernetes-cr"))
+  .enablePlugins(AutomateHeaderPlugin)
+  .disablePlugins(com.geirsson.CiReleasePlugin, MimaPlugin)
   .settings(
-    Defaults.itSettings
+    name := "integration-tests-rolling-update-kubernetes-cr",
+    libraryDependencies := Dependencies.RollingUpdateKubernetesCrIntegration,
+    publish / skip := true
   )
-  .configs(IntegrationTest)
-  .dependsOn(`akka-management-pki`)
+  .dependsOn(`rolling-update-kubernetes`)
 
 lazy val `lease-kubernetes` = project
   .in(file("lease-kubernetes"))

diff --git a/...rnetes/KubernetesApiIntegrationTest.scala → ...rnetes/KubernetesApiIntegrationTest.scala b/...rnetes/KubernetesApiIntegrationTest.scala → ...rnetes/KubernetesApiIntegrationTest.scala
diff --git a/...llingupdate-kubernetes/src/main/scala/akka/cluster/bootstrap/PodDeletionCostDemoApp.scala b/...llingupdate-kubernetes/src/main/scala/akka/cluster/bootstrap/PodDeletionCostDemoApp.scala
@@ -10,7 +10,8 @@ import akka.http.scaladsl.Http
 import akka.http.scaladsl.server.Directives._
 import akka.management.cluster.bootstrap.ClusterBootstrap
 import akka.management.scaladsl.AkkaManagement
-import akka.rollingupdate.kubernetes.{ AppVersionRevision, PodDeletionCost }
+import akka.rollingupdate.kubernetes.AppVersionRevision
+import akka.rollingupdate.kubernetes.PodDeletionCost
 
 object PodDeletionCostDemoApp extends App {
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -158,12 +158,19 @@ object Dependencies {
     "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion,
     "com.typesafe.akka" %% "akka-http-spray-json" % AkkaHttpVersion,
     "com.typesafe.akka" %% "akka-testkit" % AkkaVersion % Test,
-    "org.scalatest" %% "scalatest" % ScalaTestVersion % "it,test",
+    "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
     "com.github.tomakehurst" % "wiremock-jre8" % "2.34.0" % Test,
-    "org.scalatestplus" %% "junit-4-13" % ScalaTestPlusJUnitVersion % "test",
-    "com.typesafe.akka" %% "akka-testkit" % AkkaVersion % "it,test"
+    "org.scalatestplus" %% "junit-4-13" % ScalaTestPlusJUnitVersion % Test,
+    "com.typesafe.akka" %% "akka-testkit" % AkkaVersion % Test
   )
 
+  val RollingUpdateKubernetesCrIntegration = RollingUpdateKubernetes ++ Seq(
+      "org.scalatest" %% "scalatest" % ScalaTestVersion % Test,
+      "com.github.tomakehurst" % "wiremock-jre8" % "2.34.0" % Test,
+      "org.scalatestplus" %% "junit-4-13" % ScalaTestPlusJUnitVersion % Test,
+      "com.typesafe.akka" %% "akka-testkit" % AkkaVersion % Test
+    )
+
   val LeaseKubernetes = Seq(
     "com.typesafe.akka" %% "akka-actor" % AkkaVersion,
     "com.typesafe.akka" %% "akka-coordination" % AkkaVersion,

diff --git a/...etes/src/test/scala/doc/akka/rollingupdate/kubernetes/AppVersionRevisionCompileOnly.scala b/...etes/src/test/scala/doc/akka/rollingupdate/kubernetes/AppVersionRevisionCompileOnly.scala
@@ -5,7 +5,7 @@
 package doc.akka.rollingupdate.kubernetes
 
 import akka.actor.ActorSystem
-import akka.rollingupdate.kubernetes.{ AppVersionRevision }
+import akka.rollingupdate.kubernetes.AppVersionRevision
 
 object AppVersionRevisionCompileOnly {