DevOps-416 Added Fastlane

Author: dermooods

Jenkinsfile

@@ -1,12 +1,23 @@
 #!groovy
 
 class DockerParameters {
-    def image = 'catrobat/catrobat-android'
-    def imageLabel = 'stable'
+    def fileName = 'Dockerfile.jenkins'
+
+    // 'docker build' would normally copy the whole build-dir to the container, changing the
+    // docker build directory avoids that overhead
+    def dir = 'docker'
+
+    // Pass the uid and the gid of the current user (jenkins-user) to the Dockerfile, so a
+    // corresponding user can be added. This is needed to provide the jenkins user inside
+    // the container for the ssh-agent to work.
+    // Another way would be to simply map the passwd file, but would spoil additional information
+    // Also hand in the group id of kvm to allow using /dev/kvm.
+    def buildArgs = '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
+
     def args = '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=14G'
     def label = 'LimitedEmulator'
 }
-
+ 
 def d = new DockerParameters()
 
 def junitAndCoverage(String jacocoReportDir, String jacocoReportXml, String coverageName) {
@@ -77,11 +88,12 @@ pipeline {
             parallel {
                 stage('1') {
                     agent {
-                        docker {
-                            image useDockerLabelParameter(d.image, d.imageLabel)
+                        dockerfile {
+                            filename d.fileName
+                            dir d.dir
+                            additionalBuildArgs d.buildArgs
                             args d.args
                             label useDebugLabelParameter(d.label)
-                            alwaysPull true
                         }
                     }
 
@@ -222,18 +234,19 @@ pipeline {
 
                 stage('2') {
                     agent {
-                        docker {
-                            image useDockerLabelParameter(d.image, d.imageLabel)
+                        dockerfile {
+                            filename d.fileName
+                            dir d.dir
+                            additionalBuildArgs d.buildArgs
                             args d.args
                             label useDebugLabelParameter(d.label)
-                            alwaysPull true
                         }
                     }
 
                     stages {
                         stage('Pull Request Suite') {
                             steps {
-                                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                                catchError(buildResult: 'FAILURE' ,stageResult: 'FAILURE') {
                                     sh '''./gradlew copyAndroidNatives -PenableCoverage -PlogcatFile=pull_request_suite_logcat.txt -Pemulator=android28 \
                                             startEmulator createCatroidDebugAndroidTestCoverageReport \
                                             -Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.testsuites.UiEspressoPullRequestTriggerSuite'''
@@ -253,12 +266,6 @@ pipeline {
     }
 
     post {
-        always {
-            node('master') {
-                unstash 'logParserRules'
-                step([$class: 'LogParserPublisher', failBuildOnError: true, projectRulePath: 'buildScripts/log_parser_rules', unstableOnWarning: true, useProjectRule: true])
-            }
-        }
         changed {
             node('master') {
                 notifyChat()

docker/Dockerfile.jenkins

@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:buster
 # Android Dependencies
 # --------------------
 # Adapt the paramters below to change the dependencies.
@@ -31,7 +31,7 @@ ARG _SDKMANAGER=$ANDROID_SDK_ROOT/tools/bin/sdkmanager
 # x11-commons/x11-utils/libpulse0 needed to start emulator
 RUN apt-get update && apt-get install -y --no-install-recommends \
         curl \
-        openjdk-8-jdk \
+#        openjdk-8-jdk \
         unzip \
         openssh-client \
          x11-common \
@@ -40,21 +40,30 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
          libxcursor-dev \
          libnss3-dev \
          libasound2 \
+         wget \
+         gnupg \
+         software-properties-common \
     && rm -rf /var/lib/apt/lists/*
 # Install Fastlane
-#RUN apt-get update && apt-get install -y --no-install-recommends \
-#        rubygems \
-#        ruby-dev \
-#        g++ \
-#        make \
-#        less \
-#    && rm -rf /var/lib/apt/lists/* \
-#    && gem update --system \
-#    && gem install fastlane -NV \
-#    && apt-get purge -y --auto-remove \
-#        ruby-dev \
-#        g++ \
-#        make
+RUN wget --no-check-certificate -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
+RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+
+RUN apt-get update && apt-get install -y adoptopenjdk-8-hotspot
+RUN apt-get install -y python2
+RUN apt-get install -y --no-install-recommends \
+        rubygems \
+        ruby-dev \
+        g++ \
+        make \
+        less \
+        git \
+    && rm -rf /var/lib/apt/lists/* \
+    && gem update --system \
+    && gem install fastlane -NV \
+    && apt-get purge -y --auto-remove \
+        ruby-dev \
+        g++ \
+        make
 # User Management
 # ---------------
 #