From 9258797c0d697b82fa0bb6103e70b34eec3feaf9 Mon Sep 17 00:00:00 2001
From: Hallvard Traetteberg <hal@ntnu.no>
Date: Wed, 10 Jan 2018 14:35:47 +0100
Subject: [PATCH] Added property for turning of ui tests, for issue #7
---
.gitlab-ci.yml | 2 +-
tdt4140-gr1800/app.ui/pom.xml | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc6e2b3..576e8ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ cache:
variables:
MAVEN_OPTS: "-Djava.awt.headless=true -Dmaven.repo.local=.m2/repository"
- MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
+ MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -Dskip-ui-tests=true"
build-job:
stage: build
diff --git a/tdt4140-gr1800/app.ui/pom.xml b/tdt4140-gr1800/app.ui/pom.xml
index 7deb2ae..bf8d4bf 100644
--- a/tdt4140-gr1800/app.ui/pom.xml
+++ b/tdt4140-gr1800/app.ui/pom.xml
@@ -45,4 +45,21 @@
</dependency>
</dependencies>
+ <properties>
+ <skip-ui-tests>false</skip-ui-tests>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.20.1</version>
+ <configuration>
+ <skipTests>${skip-ui-tests}</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
--
GitLab