diff --git a/.github/workflows/ci-delta-ship.yml b/.github/workflows/ci-delta-ship.yml index 4d33a9d873..2516021a95 100644 --- a/.github/workflows/ci-delta-ship.yml +++ b/.github/workflows/ci-delta-ship.yml @@ -35,7 +35,6 @@ jobs: - name: Clean, build Delta & Storage images run: | sbt -Dsbt.color=always -Dsbt.supershell=false \ - clean \ app/Docker/publishLocal - name: Start services run: docker-compose -f tests/docker/docker-compose.yml up -d @@ -46,5 +45,5 @@ jobs: - name: Unit tests run: | sbt -Dsbt.color=always -Dsbt.supershell=false \ - clean \ - ship-unit-tests + ship/test -- -l "ch.epfl.bluebrain.nexus.ship.tags.Integration" + ship/test -- -n "ch.epfl.bluebrain.nexus.ship.tags.Integration" diff --git a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/EndToEndTest.scala b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/EndToEndTest.scala index ba83fce6d8..98204d4f0e 100644 --- a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/EndToEndTest.scala +++ b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/EndToEndTest.scala @@ -9,6 +9,7 @@ import ch.epfl.bluebrain.nexus.delta.rdf.Vocabulary.nxv import ch.epfl.bluebrain.nexus.delta.sourcing.exporter.ExportEventQuery import ch.epfl.bluebrain.nexus.delta.sourcing.model.{Label, ProjectRef} import ch.epfl.bluebrain.nexus.delta.sourcing.offset.Offset +import ch.epfl.bluebrain.nexus.ship.tags.Integration import ch.epfl.bluebrain.nexus.tests.BaseIntegrationSpec import ch.epfl.bluebrain.nexus.tests.Identity.writer import ch.epfl.bluebrain.nexus.tests.admin.ProjectPayload @@ -22,6 +23,7 @@ import java.nio.file.{Files, Paths} import scala.concurrent.duration.DurationInt import scala.jdk.CollectionConverters.IteratorHasAsScala +@Integration class EndToEndTest extends BaseIntegrationSpec { override def beforeAll(): Unit = { diff --git a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/tags/Integration.java b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/tags/Integration.java new file mode 100644 index 0000000000..4ce17a9617 --- /dev/null +++ b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/tags/Integration.java @@ -0,0 +1,13 @@ +package ch.epfl.bluebrain.nexus.ship.tags; + +import org.scalatest.TagAnnotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@TagAnnotation +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface Integration {} \ No newline at end of file diff --git a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/tags/TagObjects.scala b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/tags/TagObjects.scala new file mode 100644 index 0000000000..33a3605d07 --- /dev/null +++ b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/tags/TagObjects.scala @@ -0,0 +1,10 @@ +package ch.epfl.bluebrain.nexus.ship.tags + +import org.scalatest.Tag + +object TagObjects { + + object Integration extends Tag("ch.epfl.bluebrain.nexus.ship.tags.Integration") + +} +