Merge pull request #21 from OpsMx/feature/OP-22224-OES-upgrade-1.33.x

Upgrading kayenta-oes from OES-1.30.X to OES-1.33.X

.github/workflows/kayenta-oes.yml

@@ -30,8 +30,8 @@ jobs:
         id: build_variables
         run: |
           echo ::set-output name=REPO::ubi8-kayenta-cve
-          #echo ::set-output name=VERSION::"1.33.1$(date --utc +'%Y%m%d')"
-          #echo ::set-output name=VERSION::"1.33.1$(date --utc +'%-m%d')"
+          #echo ::set-output name=VERSION::"1.33.x$(date --utc +'%Y%m%d')"
+          #echo ::set-output name=VERSION::"1.33.x$(date --utc +'%-m%d')"
           echo ::set-output name=VERSION::"1.33.2"
           echo "::set-output name=GITHASH::$(git rev-parse --short HEAD)"
           echo "::set-output name=BUILDDATE::$(date -u +"%Y%m%d%H%M")"

Dockerfile.slim

@@ -1,6 +1,6 @@
 FROM alpine:3.16
 LABEL maintainer="[email protected]"
-RUN apk --no-cache add --update bash openjdk11-jre
+RUN apk --no-cache add --update bash openjdk17-jre
 RUN addgroup -S -g 10111 spinnaker
 RUN adduser -S -G spinnaker -u 10111 spinnaker
 COPY kayenta-web/build/install/kayenta /opt/kayenta

Dockerfile.ubuntu

@@ -1,6 +1,6 @@
 FROM ubuntu:bionic
 LABEL maintainer="[email protected]"
-RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
+RUN apt-get update && apt-get -y install openjdk-17-jre-headless wget
 RUN adduser --system --uid 10111 --group spinnaker
 COPY kayenta-web/build/install/kayenta /opt/kayenta
 RUN mkdir -p /opt/kayenta/plugins && chown -R spinnaker:nogroup /opt/kayenta/plugins

build.gradle

@@ -43,15 +43,16 @@ subprojects { project ->
         mavenLocal()
         maven{
           url  "NEXUS_URL"
-              credentials {
-                    username = "NEXUS_USERNAME"
-                    password = "NEXUS_PASSWORD"
-                         }
+          credentials {
+            username = "NEXUS_USERNAME"
+            password = "NEXUS_PASSWORD"
+          }
         }
       }
     }
 
     test {
+      useJUnitPlatform()
       testLogging {
         exceptionFormat = "full"
         afterSuite { desc, result ->
@@ -71,6 +72,17 @@ subprojects { project ->
       }
     }
 
+    tasks.withType(JavaCompile).configureEach {
+      javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(17)
+      }
+    }
+    tasks.withType(Test).configureEach {
+      javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(17)
+      }
+    }
+
     configurations.all {
       exclude group: 'org.mortbay.jetty', module: 'servlet-api'
       exclude group: 'javax.servlet', module: 'servlet-api'
@@ -95,6 +107,7 @@ subprojects { project ->
         api 'com.typesafe.scala-logging:scala-logging_2.12:3.9.2'
         implementation 'org.apache.ivy:ivy:2.5.2'
         testImplementation 'org.scalatest:scalatest_2.12:3.0.9'
+        testRuntimeOnly 'org.scalatestplus:junit-5-9_2.12:3.2.16.0'
       }
       implementation enforcedPlatform("io.spinnaker.orca:orca-bom:$orcaVersion")
       compileOnly "org.projectlombok:lombok"
@@ -127,6 +140,8 @@ subprojects { project ->
       //testImplementation "org.apache.groovy:groovy-all"
       testRuntimeOnly "cglib:cglib-nodep"
       testRuntimeOnly "org.objenesis:objenesis"
+      testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+      testRuntimeOnly "org.junit.vintage:junit-vintage-engine" //Required for spock tests to execute along with junit5 tests
     }
   }
 

gradle.properties

@@ -2,3 +2,4 @@ orcaVersion=1.33.0-SNAPSHOT
 org.gradle.parallel=true
 spinnakerGradleVersion=1.33.0-SNAPSHOT
 #targetJava11=true
+org.gradle.jvmargs=-Xmx2g