Update readme and change CI build config in .gitlab-ci.yml

.gitlab-ci.yml

@@ -14,25 +14,28 @@ variables:
   MAVEN_OPTS: "-Djava.awt.headless=true -Dmaven.repo.local=.m2/repository"
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -Dgitlab-ci=true"
 
-build-job:
-  stage: build
-  script:
-    - "mvn clean compile -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
-    - "mvn clean compile -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
+#build-job:
+#  stage: build
+#  script:
+#    - "mvn clean compile -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
+#    - "mvn clean compile -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
 
 unittest-job:
   stage: test
-  dependencies:
-    - build-job
+#  dependencies:
+#    - build-job
   script:
-    - "mvn package -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
-    - "mvn package -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
+    - "mvn test -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
+    - "mvn test -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
     - "cat tdt4140-gr1800/app.core/target/site/jacoco/index.html"
 
 integrationtest-job:
   stage: test
-  dependencies:
-    - build-job
+  only:
+    - web
+#  dependencies:
+#    - build-job
   script:
     - "mvn verify -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
     - "mvn verify -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
+

tdt4140-gr1800/README.md

 # Example project for the TDT4140 course, Spring 2018
 
 This project is an example for Spring 2018, based on the [template project](../tdt4140-gr18nn/README.md)
+
+## The example project
+
+The example project is meant to illustrate the expected architecture, as well as demonstrate relevant implementation techniques, including project and build configuration and coding and library usage.
+
+This project is about managing sets of geo-locations, like tracks from hiking og training, similar to what you get from apps like Strava. The project includes two systems:
+* a JavaFX app for visualising, analysing and editing sets of geo-locations
+* web server with a REST API for managing sets of geo-locations, primarily for collecting the geo-locations from apps, but also as persistence layer for the JavaFX app
+