Fix #23201: run tests on Jenkins

Author: LEDfan

JenkinsfileSCM

@@ -12,19 +12,49 @@ pipeline {
         buildDiscarder(logRotator(numToKeepStr: '3'))
     }
 
+    environment {
+        SPO_DOCKER_SOCKET = "/var/run/docker/docker.sock"
+        SPO_DOCKER_GID = "2375"
+        KUBERNETES_TRUST_CERTIFICATES = "true"
+    }
+
     stages {
 
-        stage('build and deploy to nexus'){
+        stage('prepare') {
+            steps {
+
+                container('docker') {
+                    sh 'echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories'
+                    sh 'apk add minikube@testing'
+                    sh 'docker network create sp-shared-network'
+                    sh 'docker plugin install "grafana/loki-docker-driver:3.2.1" --alias loki --grant-all-permissions'
+                    sh 'adduser -D -u 1000 user && adduser user docker'
+                    sh "su user /bin/sh -c 'minikube start --driver=docker --force'"
+                    sh "su user /bin/sh -c 'minikube kubectl -- config view --flatten > /tmp/kubeconfig'"
+                    script {
+                        env.KUBERNETES_MASTER = "https://" + sh(returnStdout: true, script: "su user  /bin/sh -c 'minikube ip'").trim() + ":8443"
+                    }
+                }
+
+            }
+
+        }
+
+        stage('build and deploy to nexus') {
+
+            environment {
+                KUBECONFIG = "/tmp/kubeconfig"
+            }
 
             steps {
 
                 container('shinyproxy-operator-build') {
 
-                     configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
+                    configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
 
-                         sh 'mvn -B -s $MAVEN_SETTINGS_RSB -U clean deploy -DskipTests'
+                        sh 'mvn -Dmaven.repo.local=/tmp/m2 -B -s $MAVEN_SETTINGS_RSB -U clean deploy'
 
-                     }
+                    }
                 }
             }
         }

kubernetesPod.yaml

@@ -4,16 +4,51 @@ metadata:
   labels:
     ci: shinyproxy-operator-build
 spec:
+  volumes:
+    - name: docker-socket
+      emptyDir: { }
+    - name: tmp
+      emptyDir: { }
   containers:
     - name: shinyproxy-operator-build
-      image: public.ecr.aws/docker/library/maven:3-eclipse-temurin-17-focal
+      image: public.ecr.aws/docker/library/maven:3-eclipse-temurin-21-jammy
+      securityContext:
+        runAsUser: 1000
+        runAsGroup: 2375
       command:
         - cat
       tty: true
+      env:
+        - name: DOCKER_HOST
+          value: unix:///var/run/docker/docker.sock
+      volumeMounts:
+        - mountPath: /var/run/docker
+          name: docker-socket
+        - mountPath: /tmp/
+          name: tmp
       resources:
        requests:
-         memory: "2Gi"
-         cpu: "1.0"
+         memory: "4Gi"
+         cpu: "2"
        limits:
          memory: "4Gi"
-         cpu: "1.5"
+         cpu: "2"
+    - name: docker
+      image: public.ecr.aws/docker/library/docker:dind
+      securityContext:
+        privileged: true
+      env:
+        - name: DOCKER_HOST
+          value: unix:///var/run/docker/docker.sock
+      volumeMounts:
+        - mountPath: /var/run/docker
+          name: docker-socket
+        - mountPath: /tmp/
+          name: tmp
+      resources:
+        requests:
+          memory: "4Gi"
+          cpu: "2"
+        limits:
+          memory: "4Gi"
+          cpu: "2"

src/main/kotlin/eu/openanalytics/shinyproxyoperator/impl/docker/monitoring/CAdvisorConfig.kt

@@ -50,7 +50,7 @@ class CAdvisorConfig(private val dockerClient: DockerClient, private val dockerA
             .binds(
                 HostConfig.Bind.builder()
                     .from(dockerSocket)
-                    .to("/var/run/docker.sock")
+                    .to("/docker.sock")
                     .readOnly(true)
                     .build(),
                 HostConfig.Bind.builder()
@@ -88,7 +88,7 @@ class CAdvisorConfig(private val dockerClient: DockerClient, private val dockerA
             .image(cAdvisorImage)
             .hostConfig(hostConfig)
             .labels(mapOf("app" to "cadvisor"))
-            .cmd(listOf("--docker_only=true", "--enable_metrics=cpu,memory,network"))
+            .cmd(listOf("--docker_only=true", "--docker=unix:///docker.sock", "--enable_metrics=cpu,memory,network"))
             .build()
 
         logger.info { "[cAdvisor] Creating new container" }

src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/docker/helpers/DockerAssertions.kt

@@ -40,6 +40,7 @@ class DockerAssertions(private val base: IntegrationTestBase,
 
     private val objectMapper = ObjectMapper(YAMLFactory()).registerKotlinModule()
     private val dockerGID = Config().readConfigValue(null, "SPO_DOCKER_GID") { it }
+    private val dockerSocket = Config().readConfigValue("/var/run/docker.sock", "SPO_DOCKER_SOCKET") { it }
 
     fun assertRedisContainer() {
         val redisContainer = base.inspectContainer(this.base.getContainerByName("sp-redis"))
@@ -120,7 +121,7 @@ class DockerAssertions(private val base: IntegrationTestBase,
         assertEquals("sp-shared-network", containerInfo.hostConfig().networkMode())
         assertEquals(listOf("sp-network-${shinyProxyInstance.realmId}", "sp-shared-network"), containerInfo.networkSettings().networks().keys.toList())
         assertEquals(listOf(
-            "/var/run/docker.sock:/var/run/docker.sock:ro",
+            "$dockerSocket:/var/run/docker.sock:ro",
             "${dataDir}${containerInfo.name()}/application.yml:/opt/shinyproxy/application.yml:ro",
             "${dataDir}${containerInfo.name()}/generated.yml:/opt/shinyproxy/generated.yml:ro",
             "${dataDir}${containerInfo.name()}/templates:/opt/shinyproxy/templates:ro",