Merge branch 'release/2.2.0'

Author: LEDfan

.editorconfig

@@ -1,40 +1,41 @@
 name: Tests
 
-on: [push]
+on:
+  push:
+  workflow_dispatch:
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
         kubernetes:
-          - 'v1.24.17'
-          - 'v1.25.15'
-          - 'v1.26.14'
-          - 'v1.27.11'
-          - 'v1.28.7'
-          - 'v1.29.2'
+          - 'v1.30.11'
+          - 'v1.31.7'
+          - 'v1.32.3'
 
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
+          distribution: temurin
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.10.0
+        uses: manusa/actions-setup-minikube@v2.13.1
         with:
-          minikube version: 'v1.32.0'
+          minikube version: 'v1.33.0'
           kubernetes version:  ${{ matrix.kubernetes }}
           github token: ${{ secrets.GITHUB_TOKEN }}
+          container runtime: containerd
           driver: docker
       - name: Pull images
         run: |
@@ -43,18 +44,8 @@ jobs:
       - name: Build with Maven
         run: mvn -B -U clean install -DskipTests
       - name: Run Tests
-        run: mvn -B test
-
-#  dependency:
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Run Dependency Check
-#        run: mvn -Powasp-dependency-check verify -DskipTests
-#      - name: Archive code coverage results
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: dependency-check-report
-#          path: target/dependency-check-report.html
-#
+        run: |
+          docker network create sp-shared-network
+          docker plugin install "grafana/loki-docker-driver:3.2.1" --alias loki --grant-all-permissions
+          export SPO_DOCKER_GID=$(getent group docker | cut -d: -f3)
+          mvn -B test

.github/workflows/workflows.yaml

@@ -229,3 +229,6 @@ buildNumber.properties
 
 docs/deployment/overlays/0-dev/**
 build.sh
+input/
+redis_password.txt
+logs/

.gitignore

@@ -0,0 +1,91 @@
+pipeline {
+
+    agent {
+        kubernetes {
+            inheritFrom "default"
+            yamlFile 'kubernetesPod.yaml'
+            yamlMergeStrategy merge()
+        }
+    }
+
+    parameters {
+        booleanParam(name: 'SkipTests', defaultValue: false)
+    }
+
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '3'))
+    }
+
+    environment {
+        SPO_DOCKER_SOCKET = "/var/run/docker/docker.sock"
+        SPO_DOCKER_GID = "2375"
+        KUBERNETES_TRUST_CERTIFICATES = "true"
+    }
+
+    stages {
+
+        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') {
+            environment {
+                KUBECONFIG = "/tmp/kubeconfig"
+            }
+
+            steps {
+
+                container('shinyproxy-operator-build') {
+                    configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
+                        sh 'mvn -Dmaven.repo.local=/tmp/m2 -B -s $MAVEN_SETTINGS_RSB -U clean package -DskipTests'
+                    }
+                }
+            }
+        }
+
+        stage('test') {
+            environment {
+                KUBECONFIG = "/tmp/kubeconfig"
+            }
+
+            when {
+                equals expected: false, actual: params.SkipTests
+            }
+
+            steps {
+                container('shinyproxy-operator-build') {
+                    configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
+                        sh 'mvn -Dmaven.repo.local=/tmp/m2 -B -s $MAVEN_SETTINGS_RSB test'
+                    }
+                }
+            }
+        }
+
+        stage('deploy to Nexus') {
+            environment {
+                KUBECONFIG = "/tmp/kubeconfig"
+            }
+
+            steps {
+                container('shinyproxy-operator-build') {
+                    configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
+                        sh 'mvn -Dmaven.repo.local=/tmp/m2 -B -s $MAVEN_SETTINGS_RSB deploy -DskipTests'
+                    }
+                }
+            }
+        }
+    }
+}

Jenkinsfile

@@ -1,6 +1,6 @@
-ShinyProxy-Operator
+${project.name}
 
-Copyright (C) 2021-2024 Open Analytics
+Copyright (C) ${project.inceptionYear}-${year} Open Analytics
 
 ===========================================================================