From 61320b5dbef5495e50b44b2ab949aadb672c5d39 Mon Sep 17 00:00:00 2001 From: az Date: Thu, 23 Feb 2023 22:39:34 +0100 Subject: [PATCH] exclude NonCi tests from ci --- .gitlab-ci.yml | 2 +- .../provs/configuration/domain/CliTargetCommandTest.kt | 2 ++ .../org/domaindrivenarchitecture/provs/test/tags/Tags.kt | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0cdb72..f2ad9d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ test: - docker build --pull -t "$CI_REGISTRY_IMAGE" . - docker run --privileged -dit --name provs_test -v /var/run/docker.sock:/var/run/docker.sock $CI_REGISTRY_IMAGE - docker inspect -f '{{.State.Running}}' provs_test - - ./gradlew -x assemble test -Dtestdockerwithoutsudo=true -DexcludeTags=extensivecontainertest + - ./gradlew -x assemble test -Dtestdockerwithoutsudo=true -DexcludeTags=extensivecontainertest,nonci artifacts: when: on_failure paths: diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/configuration/domain/CliTargetCommandTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/configuration/domain/CliTargetCommandTest.kt index c69409b..0afe8b8 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/configuration/domain/CliTargetCommandTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/configuration/domain/CliTargetCommandTest.kt @@ -8,6 +8,7 @@ import org.domaindrivenarchitecture.provs.framework.core.cli.retrievePassword import org.domaindrivenarchitecture.provs.framework.core.local import org.domaindrivenarchitecture.provs.framework.core.processors.PrintOnlyProcessor import org.domaindrivenarchitecture.provs.framework.core.remote +import org.domaindrivenarchitecture.provs.test.tags.NonCi import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test @@ -39,6 +40,7 @@ internal class CliTargetCommandKtTest { @Test + @NonCi fun createProvInstance_local() { // given val cliCommand = TargetCliCommand("local", false) diff --git a/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/tags/Tags.kt b/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/tags/Tags.kt index 35b65c9..b5cb961 100644 --- a/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/tags/Tags.kt +++ b/src/testFixtures/kotlin/org/domaindrivenarchitecture/provs/test/tags/Tags.kt @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test private const val CONTAINER_TEST = "containertest" private const val EXTENSIVE_CONTAINER_TEST = "extensivecontainertest" -private const val CONTAINER_TEST_NON_CI = "containernonci" +private const val NON_CI = "nonci" @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) @@ -28,6 +28,7 @@ annotation class ExtensiveContainerTest @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) @Retention -@Tag(CONTAINER_TEST_NON_CI) +@Tag(NON_CI) @Test +// For test which do not run in ci pipeline annotation class NonCi \ No newline at end of file