JENKINS-372 use docker catrobat image in all Jenkinsfiles

Author: Jakob Fahrner

Jenkinsfile.BuildStandalone

@@ -4,20 +4,13 @@ def standaloneApk = 'catroid/build/outputs/apk/standalone/debug/catroid-standalo
 
 pipeline {
     agent {
-        dockerfile {
-            filename 'Dockerfile.jenkins'
-            // 'docker build' would normally copy the whole build-dir to the container, changing the
-            // docker build directory avoids that overhead
-            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.
-            additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
-            args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle'
-            // Add specific 'Standalone'-label, so it can be made sure, that there is a dedicated host for standalone builds
-            label 'Standalone'
+        agent {
+            docker {
+                image 'catrobat/catrobat-android:stable'
+                args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle'
+                label 'Standalone'
+                alwaysPull true
+            }
         }
     }
 

Jenkinsfile.ManualTests

@@ -2,19 +2,11 @@
 
 pipeline {
     agent {
-        dockerfile {
-            filename 'Dockerfile.jenkins'
-            // 'docker build' would normally copy the whole build-dir to the container, changing the
-            // docker build directory avoids that overhead
-            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.
-            additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
+        docker {
+            image 'catrobat/catrobat-android:stable'
             args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
             label 'LimitedEmulator'
+            alwaysPull true
         }
     }
 

Jenkinsfile.OutgoingNetworkCallsTests

@@ -2,19 +2,11 @@
 
 pipeline {
     agent {
-        dockerfile {
-            filename 'Dockerfile.jenkins'
-            // 'docker build' would normally copy the whole build-dir to the container, changing the
-            // docker build directory avoids that overhead
-            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.
-            additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
+        docker {
+            image 'catrobat/catrobat-android:stable'
             args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
             label 'LimitedEmulator'
+            alwaysPull true
         }
     }
 

Jenkinsfile.SensorboxTests

@@ -1,20 +1,11 @@
 #!groovy
 pipeline {
     agent {
-        dockerfile {
-            filename 'Dockerfile.jenkins'
-            // 'docker build' would normally copy the whole build-dir to the container, changing the
-            // docker build directory avoids that overhead
-            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.
-            additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
+        docker {
+            image 'catrobat/catrobat-android:stable'
             args '--net host -v /dev/bus/usb/:/dev/bus/usb -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle'
-            // run on slave1 where nexus is connected to
             label 'HardwareSensorBox'
+            alwaysPull true
         }
     }
 

Jenkinsfile.buildMetadata

@@ -2,19 +2,11 @@
 
 pipeline {
     agent {
-        dockerfile {
-            filename 'Dockerfile.jenkins'
-            // 'docker build' would normally copy the whole build-dir to the container, changing the
-            // docker build directory avoids that overhead
-            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.
-            additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
+        docker {
+            image 'catrobat/catrobat-android:stable'
             args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
             label 'LimitedEmulator'
+            alwaysPull true
         }
     }
 

Jenkinsfile.releaseAPK

@@ -2,19 +2,11 @@
 
 pipeline {
     agent {
-        dockerfile {
-            filename 'Dockerfile.jenkins'
-            // 'docker build' would normally copy the whole build-dir to the container, changing the
-            // docker build directory avoids that overhead
-            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.
-            additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
+        docker {
+            image 'catrobat/catrobat-android:stable'
             args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
             label 'LimitedEmulator'
+            alwaysPull true
         }
     }