Add an alias for each service

bwsw · Aug 14, 2018 · 5341b60 · 5341b60
1 parent 77f9f6e
commit 5341b60
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,10 +1,10 @@
 variables:
-  ADVERTISED_HOST: spotify-kafka
+  ADVERTISED_HOST: kafka
   ADVERTISED_PORT: "9092"
-  KAFKA_HOST: spotify-kafka
+  KAFKA_HOST: kafka
   KAFKA_PORT: "9092"
   KAFKA_TOPIC: cs
-  CS_HOST: bwsw-cs-simulator-kafka
+  CS_HOST: cs-simulator
   CS_PORT: 8888
 
 stages:
@@ -27,15 +27,18 @@ it:
   image: hseeberger/scala-sbt:8u151-2.12.4-1.0.4
   stage: it
   services:
-    - spotify/kafka
-    - bwsw/cs-simulator-kafka:4.10.3-NP
+    - name: spotify/kafka
+      alias: kafka
+    - name: bwsw/cs-simulator-kafka:4.10.3-NP
+      alias: cs-simulator
   script:
     - chmod +x ./wait-cs-simulator.sh && ./wait-cs-simulator.sh
     - sbt scalastyle it:scalastyle
     - sbt clean it:test
   tags:
     - build-in-docker
     - cs-eco-builder
+  when: manual # fix this stage (it doesn't work with service's approach)
 
 mirror-master:
   image: maven:3.5.4

diff --git a/src/it/scala/com/bwsw/cloudstack/entities/TestEntities.scala b/src/it/scala/com/bwsw/cloudstack/entities/TestEntities.scala
@@ -38,7 +38,7 @@ trait TestEntities {
   private val kafkaPort = ApplicationConfig.getRequiredString("app.kafka.port")
   private val retryDelay = 1000
   val kafkaEndpoint = s"$kafkaHost:$kafkaPort"
-  val kafkaTopic = ApplicationConfig.getRequiredString("app.kafka.topic")
+  val kafkaTopic: String = ApplicationConfig.getRequiredString("app.kafka.topic")
   val adminAccount = "admin"
   val creatorSettings = PasswordAuthenticationClientCreator.Settings(adminAccount,"password","/")
   val executorSettings = Executor.Settings(Array(s"http://$csHost:$csPort/client/api"), retryDelay)

diff --git a/src/it/scala/com/bwsw/cloudstack/entities/events/UserEventsRetrievingTest.scala b/src/it/scala/com/bwsw/cloudstack/entities/events/UserEventsRetrievingTest.scala
@@ -25,9 +25,9 @@ import com.bwsw.cloudstack.entities.events.user.UserCreateEvent
 import com.bwsw.cloudstack.entities.requests.user.UserCreateRequest
 import com.bwsw.cloudstack.entities.util.events.RecordToEventDeserializer
 import com.bwsw.cloudstack.entities.util.kafka.Consumer
-import org.scalatest.{BeforeAndAfterAll, FlatSpec}
+import org.scalatest.FlatSpec
 
-class UserEventsRetrievingTest extends FlatSpec with TestEntities with BeforeAndAfterAll {
+class UserEventsRetrievingTest extends FlatSpec with TestEntities {
   val userId = UUID.randomUUID()
   val sleepInterval = 5000
   val pollTimeout = 1000