Add sonar

.gitlab-ci.yml

@@ -6,24 +6,12 @@ stages:
 - windows
 - linux
 
-#masterJobLinux:
-#  stage: linux
-#  image: maven:3-jdk-8
-#  before_script:
-#  - apt-get update
-#  - apt-get install -y openjfx
-#  script: 
-#  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean deploy --settings settings.xml
-#  - cat target/site/jacoco/index.html
-#  - mvn package sonar:sonar -s settings.xml
-#  only:
-#  - master
-
 masterJobWindowsRpc:
   stage: windows
   script:
   - cd rpc
   - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean deploy --settings ..\settings.xml
+  - mvn package sonar:sonar --settings ..\settings.xml -DskipTests
   tags:
   - Windows10
   only:
@@ -35,6 +23,7 @@ masterJobWindowsRestful:
   - cd restful
   # TODO: we have to skip tests for now, because most tests require a running instance of zookeeper
   - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean deploy --settings ..\settings.xml -DskipTests
+  - mvn package sonar:sonar --settings ..\settings.xml -DskipTests
   tags:
   - Windows10
   only:
@@ -61,22 +50,37 @@ branchJobWindowsRestful:
   except:
     - master
 
-#BranchJobLinux:
+#branchJobLinux:
 #  tags:
 #    - docker
 #  stage: linux
-#  image: maven:3-jdk-8
 #  before_script:
-#  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+#    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 #  script:
-##  - apt-get update
-##  - apt-get install -y openjfx
-#  - cd restful
-#  - ./run_test.sh
-##  - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-##  - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:latest
-##  - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-##  - docker push $CI_REGISTRY_IMAGE:latest
-#  #  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
+#    - cd docker
+#    - ./build.sh
+#    - ./run_test.sh
+#    - docker tag rpc-server:latest $CI_REGISTRY_IMAGE:rpc
+#    - docker tag restful-server:latest $CI_REGISTRY_IMAGE:restful
+#    - docker push $CI_REGISTRY_IMAGE:rpc
+#    - docker push $CI_REGISTRY_IMAGE:restful
 #  except:
-#  - master
+#    - master
+
+# build, test and publish docker images
+masterJobLinux:
+  tags:
+    - docker
+  stage: linux
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  script:
+    - cd docker
+    - ./build.sh
+    - ./run_test.sh
+    - docker tag rpc-server:latest $CI_REGISTRY_IMAGE:rpc
+    - docker tag restful-server:latest $CI_REGISTRY_IMAGE:restful
+    - docker push $CI_REGISTRY_IMAGE:rpc
+    - docker push $CI_REGISTRY_IMAGE:restful
+  only:
+    - master

settings.xml

@@ -5,43 +5,43 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
 
-  <pluginGroups>
-	<pluginGroup>org.mortbay.jetty</pluginGroup>
-	<pluginGroup>de.topobyte</pluginGroup>
-  </pluginGroups>
+    <pluginGroups>
+        <pluginGroup>org.mortbay.jetty</pluginGroup>
+        <pluginGroup>de.topobyte</pluginGroup>
+    </pluginGroups>
 
-  <proxies>
-  </proxies>
+    <proxies>
+    </proxies>
 
-  <servers>
-    <server>
-      <id>se-nexus</id>
-      <username>cibuild</username>
-      <password>${env.cibuild}</password>
-    </server> 
+    <servers>
+        <server>
+            <id>se-nexus</id>
+            <username>cibuild</username>
+            <password>${env.cibuild}</password>
+        </server>
 
-     <server>
-      <id>github</id>
-      <username>travisbuilduser</username>
-      <password>${env.travisbuilduserpassword}</password>
-    </server>
-  </servers>
+        <server>
+            <id>github</id>
+            <username>travisbuilduser</username>
+            <password>${env.travisbuilduserpassword}</password>
+        </server>
+    </servers>
 
-  <mirrors>
-    <mirror>
-      <id>se-nexus</id>
-      <mirrorOf>external:*</mirrorOf>
-      <url>https://nexus.se.rwth-aachen.de/content/groups/public</url>
-    </mirror>	 
-    <mirror>
-      <id>topobyte-repository</id>
-      <mirrorOf>topobyte</mirrorOf>
-      <url>http://mvn.topobyte.de/</url>
-    </mirror>	 
-  </mirrors>
+    <mirrors>
+        <mirror>
+            <id>se-nexus</id>
+            <mirrorOf>external:*</mirrorOf>
+            <url>https://nexus.se.rwth-aachen.de/content/groups/public</url>
+        </mirror>
+        <mirror>
+            <id>topobyte-repository</id>
+            <mirrorOf>topobyte</mirrorOf>
+            <url>http://mvn.topobyte.de/</url>
+        </mirror>
+    </mirrors>
 
-  <profiles>
-    <profile>
+    <profiles>
+        <profile>
             <id>sonar</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
@@ -49,27 +49,31 @@
             <properties>
                 <!-- Optional URL to server. Default value is http://localhost:9000 -->
                 <sonar.host.url>
-                  https://metric.se.rwth-aachen.de
+                    https://metric.se.rwth-aachen.de
                 </sonar.host.url>
-				<sonar.login>
-					jenkins
-				</sonar.login>
-				<sonar.password>
-					${env.sonar}
-				</sonar.password>
+                <sonar.login>
+                    jenkins
+                </sonar.login>
+                <sonar.password>
+                    ${env.sonar}
+                </sonar.password>
             </properties>
         </profile>
 
-    <profile>
-      <id>se-nexus</id>
-      <repositories>
-        <repository>
-          <id>central</id>
-          <url>http://central</url>
-          <releases><enabled /></releases>
-          <snapshots><enabled /></snapshots>
-        </repository>
-        <repository>
+        <profile>
+            <id>se-nexus</id>
+            <repositories>
+                <repository>
+                    <id>central</id>
+                    <url>http://central</url>
+                    <releases>
+                        <enabled/>
+                    </releases>
+                    <snapshots>
+                        <enabled/>
+                    </snapshots>
+                </repository>
+                <repository>
                     <id>central</id>
                     <url>https://repo1.maven.org/maven2</url>
                     <releases>
@@ -100,7 +104,7 @@
                     </snapshots>
                 </repository>
 
-        <repository>
+                <repository>
                     <id>topobyte</id>
                     <url>http://mvn.topobyte.de/</url>
                     <releases>
@@ -111,15 +115,19 @@
                     </snapshots>
                 </repository>
 
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>central</id>
-          <url>http://central</url>
-          <releases><enabled /></releases>
-          <snapshots><enabled /></snapshots>
-        </pluginRepository>
-        <pluginRepository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>central</id>
+                    <url>http://central</url>
+                    <releases>
+                        <enabled/>
+                    </releases>
+                    <snapshots>
+                        <enabled/>
+                    </snapshots>
+                </pluginRepository>
+                <pluginRepository>
                     <id>central</id>
                     <url>https://repo1.maven.org/maven2</url>
                     <releases>
@@ -150,7 +158,7 @@
                     </snapshots>
                 </pluginRepository>
 
-      <pluginRepository>
+                <pluginRepository>
                     <id>topobyte</id>
                     <url>http://mvn.topobyte.de/</url>
                     <releases>
@@ -161,12 +169,31 @@
                     </snapshots>
                 </pluginRepository>
 
-      </pluginRepositories>
-      
-    </profile>
-  </profiles>
+            </pluginRepositories>
+
+        </profile>
+
+        <profile>
+            <id>sonar</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <!-- Optional URL to server. Default value is http://localhost:9000 -->
+                <sonar.host.url>
+                    https://metric.se.rwth-aachen.de
+                </sonar.host.url>
+                <sonar.login>
+                    jenkins
+                </sonar.login>
+                <sonar.password>
+                    ${env.sonar}
+                </sonar.password>
+            </properties>
+        </profile>
+    </profiles>
 
-  <activeProfiles>
-    <activeProfile>se-nexus</activeProfile>
-  </activeProfiles>  
+    <activeProfiles>
+        <activeProfile>se-nexus</activeProfile>
+    </activeProfiles>
 </settings>