Merge branch 'release/1.1.0'

openanalytics · May 7, 2024 · 67477c5 · 67477c5
2 parents 2c71c88 + d31dbd7
commit 67477c5
Show file tree

Hide file tree

Showing 337 changed files with 21,791 additions and 13,674 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/workflows.yaml b/.github/workflows/workflows.yaml
@@ -1,23 +1,30 @@
 name: Tests
 
-on: [push]
+on:
+  push:
+  workflow_dispatch:
+
+env:
+  ITEST_ECS_REGION: dummy-region
+  ITEST_ECS_NAME: dummy-name
+  ITEST_ECS_SECURITY_GROUPS: dummy-sg
+  ITEST_ECS_SUBNETS: dummy-subnets
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         java:
-          - 8
-          - 11
+          - 17
         kubernetes:
-          - 'v1.21.6'
-          - 'v1.22.17'
-          - 'v1.23.17'
-          - 'v1.24.15'
-          - 'v1.25.11'
-          - 'v1.26.6'
-          - 'v1.27.3'
+          - 'v1.24.17'
+          - 'v1.25.16'
+          - 'v1.26.15'
+          - 'v1.27.13'
+          - 'v1.28.9'
+          - 'v1.29.4'
+          - 'v1.30.0'
 
     steps:
       - uses: actions/checkout@v2
@@ -34,7 +41,7 @@ jobs:
       - name: Setup Minikube
         uses: manusa/actions-setup-minikube@v2.7.2
         with:
-          minikube version: 'v1.30.1'
+          minikube version: 'v1.33.0'
           kubernetes version:  ${{ matrix.kubernetes }}
           github token: ${{ secrets.GITHUB_TOKEN }}
           container runtime: containerd
@@ -44,17 +51,11 @@ jobs:
       - name: Setup Docker Swarm
         run: docker swarm init
       - name: Pull Image
-        run: docker pull openanalytics/shinyproxy-demo:latest
+        run: docker pull openanalytics/shinyproxy-integration-test-app
       - name: Run redis
         run: docker run -d -p 6379:6379 redis
       - name: Build with Maven
         run: mvn -B -U clean install -DskipTests
-      - name: Copy Artifact
-        run: cp target/containerproxy-*-exec.jar target/containerproxy-app-recovery.jar
-      - name: debug
-        run: |
-          docker ps -a
-          kubectl get pod -A
       - name: Run Tests
         run:  mvn -B test
 
@@ -63,6 +64,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
       - name: Run Dependency Check
         run: mvn -B -Powasp-dependency-check verify -DskipTests
       - name: Archive code coverage results

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,6 @@ pipeline {
     agent {
         kubernetes {
             yamlFile 'kubernetesPod.yaml'
-            workspaceVolume dynamicPVC(accessModes: 'ReadWriteOnce', requestsSize: '40Gi')
         }
     }
 
@@ -21,7 +20,7 @@ pipeline {
 
                      configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
 
-                         sh 'mvn -B -s $MAVEN_SETTINGS_RSB  -Dmaven.repo.local=/home/jenkins/agent/m2 -U clean install deploy -DskipTests=true'
+                         sh 'mvn -B -s $MAVEN_SETTINGS_RSB clean install deploy -DskipTests=true'
 
                      }
                 }

diff --git a/LICENSE_HEADER b/LICENSE_HEADER
@@ -1,6 +1,6 @@
 ContainerProxy
 
-Copyright (C) 2016-2023 Open Analytics
+Copyright (C) 2016-2024 Open Analytics
 
 ===========================================================================
 

diff --git a/kubernetesPod.yaml b/kubernetesPod.yaml
@@ -5,20 +5,12 @@ metadata:
   labels:
     ci: containerproxy-build
 spec:
-  securityContext:
-    fsGroup: 65534
   containers:
     - name: containerproxy-build
-      image: 196229073436.dkr.ecr.eu-west-1.amazonaws.com/openanalytics/containerproxy-build
-      securityContext:
-        privileged: true
-      command: [ "sh" ]
-      args: [ "/usr/src/app/docker-entrypoint.sh" ]
+      image: public.ecr.aws/docker/library/maven:3-eclipse-temurin-17-focal
+      command:
+        - cat
       tty: true
-      volumeMounts:
-        - name: workspace-volume
-          subPath: docker
-          mountPath: /var/lib/docker
       resources:
         requests:
           ephemeral-storage: "20Gi"