chore(gradle): Adjust memory for gradle tests

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
     - release-*
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
+  GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx4g -Xms4g
   CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
 
 jobs:
@@ -39,6 +39,19 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
         run: ./gradlew build --stacktrace ${{ steps.build_variables.outputs.REPO }}-web:installDist
+      - name: Build local slim container image for testing
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile.slim
+          load: true
+          platforms: local
+          tags: |
+            "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated"
+      - name: Test local slim container image
+        env:
+          FULL_DOCKER_IMAGE_NAME: "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated"
+        run: ./gradlew ${{ steps.build_variables.outputs.REPO }}-integration:test
       - name: Login to GAR
         # Only run this on repositories in the 'spinnaker' org, not on forks.
         if: startsWith(github.repository, 'spinnaker/')
@@ -98,4 +111,4 @@ jobs:
           push: true
           tags: |
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-java11-unvalidated-ubuntu"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"
+            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-unvalidated-ubuntu"

.github/workflows/pr.yml

@@ -3,7 +3,7 @@ name: PR Build
 on: [ pull_request ]
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g
+  GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx4g -Xms4g
   CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
 
 jobs:
@@ -72,4 +72,17 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: |
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-java11-ubuntu"
-            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-ubuntu"
+            "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-java11-ubuntu"
+      - name: Build local slim container image for testing
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile.slim
+          load: true
+          platforms: local
+          tags: |
+            "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}"
+      - name: Test local slim container image
+        env:
+          FULL_DOCKER_IMAGE_NAME: "${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}"
+        run: ./gradlew ${{ steps.build_variables.outputs.REPO }}-integration:test

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
     - "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx6g -Xms6g -Dorg.gradle.internal.http.socketTimeout=120000 -Dorg.gradle.internal.http.connectionTimeout=120000 -Dorg.gradle.internal.remote.repository.deploy.max.attempts=6
+  GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx4g -Xms4g -Dorg.gradle.internal.http.socketTimeout=120000 -Dorg.gradle.internal.http.connectionTimeout=120000 -Dorg.gradle.internal.remote.repository.deploy.max.attempts=6
   CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
 
 jobs:

Dockerfile.java11.slim

@@ -1,9 +1,10 @@
 FROM alpine:3.16
 LABEL maintainer="[email protected]"
-RUN apk --no-cache add --update bash openjdk11-jre
+RUN apk --no-cache add --update bash curl openjdk11-jre
 RUN addgroup -S -g 10111 spinnaker
 RUN adduser -S -G spinnaker -u 10111 spinnaker
 COPY orca-web/build/install/orca /opt/orca
 RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins
 USER spinnaker
+HEALTHCHECK CMD curl --fail http://localhost:8083/health
 CMD ["/opt/orca/bin/orca"]

Dockerfile.java11.ubuntu

@@ -1,8 +1,9 @@
 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 curl openjdk-11-jre-headless wget
 RUN adduser --system --uid 10111 --group spinnaker
 COPY orca-web/build/install/orca /opt/orca
 RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins
 USER spinnaker
+HEALTHCHECK CMD curl --fail http://localhost:8083/health
 CMD ["/opt/orca/bin/orca"]

Dockerfile.slim

@@ -1,9 +1,10 @@
 FROM alpine:3.16
 LABEL maintainer="[email protected]"
-RUN apk --no-cache add --update bash openjdk17-jre
+RUN apk --no-cache add --update bash curl openjdk17-jre
 RUN addgroup -S -g 10111 spinnaker
 RUN adduser -S -G spinnaker -u 10111 spinnaker
 COPY orca-web/build/install/orca /opt/orca
 RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins
 USER spinnaker
+HEALTHCHECK CMD curl --fail http://localhost:8083/health
 CMD ["/opt/orca/bin/orca"]

Dockerfile.ubuntu

@@ -1,8 +1,9 @@
 FROM ubuntu:bionic
 LABEL maintainer="[email protected]"
-RUN apt-get update && apt-get -y install openjdk-17-jre-headless wget
+RUN apt-get update && apt-get -y install curl openjdk-17-jre-headless wget
 RUN adduser --system --uid 10111 --group spinnaker
 COPY orca-web/build/install/orca /opt/orca
 RUN mkdir -p /opt/orca/plugins && chown -R spinnaker:nogroup /opt/orca/plugins
 USER spinnaker
+HEALTHCHECK CMD curl --fail http://localhost:8083/health
 CMD ["/opt/orca/bin/orca"]

build.gradle

@@ -69,6 +69,10 @@ subprojects {
     }
 
     test {
+      minHeapSize = "512m"
+      maxHeapSize = "2g"
+      maxParallelForks = 4
+
       testLogging {
         exceptionFormat = "full"
       }

gradle.properties

@@ -1,8 +1,8 @@
-fiatVersion=1.45.0
-korkVersion=7.224.0
+fiatVersion=1.48.0
+korkVersion=7.230.0
 kotlinVersion=1.6.21
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx6g
+org.gradle.jvmargs=-Xmx4g
 spinnakerGradleVersion=8.32.1
 targetJava11=true
 

keiko-sql/keiko-sql.gradle

@@ -19,5 +19,5 @@ dependencies {
   testImplementation project(":keiko-tck")
   testImplementation "io.spinnaker.kork:kork-sql-test"
   testImplementation "org.testcontainers:mysql"
-  testImplementation "mysql:mysql-connector-java"
+  testImplementation "com.mysql:mysql-connector-j"
 }

orca-api/src/main/java/com/netflix/spinnaker/orca/api/pipeline/models/PipelineExecution.java

@@ -22,6 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -137,6 +138,20 @@ public interface PipelineExecution {
 
   void setPartition(String partition);
 
+  /**
+   * The size of the pipeline execution (not including stages) in units appropriate for the
+   * implementation (e.g. characters/bytes), if available.
+   */
+  Optional<Long> getSize();
+
+  void setSize(long size);
+
+  /**
+   * The total size of the pipeline execution including stages in units appropriate for the
+   * implementation (e.g. characters/bytes), if available.
+   */
+  Optional<Long> getTotalSize();
+
   // -------
 
   StageExecution namedStage(String type);

orca-api/src/main/java/com/netflix/spinnaker/orca/api/pipeline/models/StageExecution.java

@@ -128,6 +128,14 @@ public interface StageExecution {
 
   void setAdditionalMetricTags(Map<String, String> additionalMetricTags);
 
+  /**
+   * The size of the stage execution in units appropriate for the implementation (e.g.
+   * characters/bytes), if available.
+   */
+  Optional<Long> getSize();
+
+  void setSize(long size);
+
   // ------------- InternalStageExecution?
   // A lot of these methods are used in a single place somewhere in Orca. I don't know why we
   // decided to put a bunch

orca-applications/src/main/groovy/com/netflix/spinnaker/orca/applications/tasks/DeleteApplicationTask.groovy

@@ -29,7 +29,6 @@ import com.netflix.spinnaker.orca.KeelService
 import groovy.util.logging.Slf4j
 import org.springframework.lang.Nullable
 import org.springframework.stereotype.Component
-import retrofit.RetrofitError
 
 @Slf4j
 @Component
@@ -76,25 +75,22 @@ class DeleteApplicationTask extends AbstractFront50Task {
         front50Service.delete(application.name)
         try {
           front50Service.deletePermission(application.name)
-        } catch (RetrofitError re) {
-          if (re.response?.status == 404) {
+        } catch (SpinnakerHttpException re) {
+          if (re.responseCode == 404) {
             return TaskResult.SUCCEEDED
           }
           log.error("Could not delete application permission", re)
           return TaskResult.builder(ExecutionStatus.TERMINAL).outputs(outputs).build()
+        } catch (SpinnakerServerException e){
+          log.error("Could not delete application permission", e)
+          return TaskResult.builder(ExecutionStatus.TERMINAL).outputs(outputs).build()
         }
         // delete Managed Delivery data
         if (keelService != null) {
           log.debug("Deleting Managed Delivery data for {}", application.name)
           keelService.deleteDeliveryConfig(application.name)
         }
       }
-    } catch (RetrofitError e) {
-      if (e.response?.status == 404) {
-        return TaskResult.SUCCEEDED
-      }
-      log.error("Could not delete application", e)
-      return TaskResult.builder(ExecutionStatus.TERMINAL).outputs(outputs).build()
     } catch (SpinnakerHttpException httpException){
       if (httpException.responseCode == 404) {
         return TaskResult.SUCCEEDED

orca-applications/src/test/groovy/com/netflix/spinnaker/orca/applications/tasks/UpsertApplicationTaskSpec.groovy

@@ -19,9 +19,12 @@ package com.netflix.spinnaker.orca.applications.tasks
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
+import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus
 import com.netflix.spinnaker.orca.front50.Front50Service
 import com.netflix.spinnaker.orca.front50.model.Application
+import retrofit.RetrofitError
+import retrofit.client.Response
 import spock.lang.Specification
 import spock.lang.Subject
 import spock.lang.Unroll
@@ -57,7 +60,7 @@ class UpsertApplicationTaskSpec extends Specification {
     given:
     def app = new Application(config.application + [user: config.user])
     task.front50Service = Mock(Front50Service) {
-      1 * get(config.application.name) >> null
+      1 * get(config.application.name) >> { throw notFoundError() }
       1 * create(app)
       1 * updatePermission(*_)
       0 * _._
@@ -99,7 +102,11 @@ class UpsertApplicationTaskSpec extends Specification {
     application.user = config.user
 
     task.front50Service = Mock(Front50Service) {
-      1 * get(config.application.name) >> initialState
+      if (initialState == null) {
+        1 * get(config.application.name) >> { throw notFoundError() }
+      } else {
+        1 * get(config.application.name) >> initialState
+      }
       1 * "${operation}"(*_)
       _ * updatePermission(*_)
       0 * _._
@@ -150,4 +157,13 @@ class UpsertApplicationTaskSpec extends Specification {
     [:]                                                         || 1
     [READ: ["[email protected]"], WRITE: ["[email protected]"]] || 1
   }
+
+  private static SpinnakerHttpException notFoundError() {
+    return new SpinnakerHttpException(RetrofitError.httpError(
+      "http://front50",
+      new Response("http://front50", 404, "Not Found", [], null),
+      null,
+      null
+    ))
+  }
 }

orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/CreateBakeTask.groovy

@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.kork.artifacts.model.Artifact
 import com.netflix.spinnaker.kork.core.RetrySupport
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
+import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus
 import com.netflix.spinnaker.orca.api.pipeline.RetryableTask
 import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution
@@ -41,7 +42,6 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
-import retrofit.RetrofitError
 
 
 import static com.netflix.spinnaker.kork.web.selector.v2.SelectableService.*
@@ -86,7 +86,7 @@ class CreateBakeTask implements RetryableTask {
           stage.context.user = user
         }
       }
-    } catch (RetrofitError e) {
+    } catch (SpinnakerServerException e) {
       // ignore exception, we will just use the owner passed to us
       if (!e.message.contains("404")) {
         log.warn("Error retrieving application {} from front50, ignoring.", stage.execution.application, e)

orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/api/BakeryServiceSpec.groovy

@@ -21,7 +21,6 @@ import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
 import com.netflix.spinnaker.orca.bakery.config.BakeryConfiguration
 import com.netflix.spinnaker.orca.jackson.OrcaObjectMapper
 import retrofit.RequestInterceptor
-import retrofit.RetrofitError
 import retrofit.client.OkClient
 import spock.lang.Specification
 import spock.lang.Subject

orca-bakery/src/test/groovy/com/netflix/spinnaker/orca/bakery/tasks/CompletedBakeTaskSpec.groovy

@@ -17,6 +17,7 @@
 package com.netflix.spinnaker.orca.bakery.tasks
 
 import com.netflix.spinnaker.kork.artifacts.model.Artifact
+import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException
 import com.netflix.spinnaker.kork.web.selector.v2.SelectableService
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus
 import com.netflix.spinnaker.orca.bakery.BakerySelector
@@ -39,12 +40,12 @@ class CompletedBakeTaskSpec extends Specification {
 
   @Shared PipelineExecutionImpl pipeline = pipeline()
 
-  @Shared notFoundError = RetrofitError.httpError(
+  @Shared notFoundError = new SpinnakerHttpException(RetrofitError.httpError(
     null,
     new Response("http://bakery", HTTP_NOT_FOUND, "Not Found", [], null),
     null,
     null
-  )
+  ))
 
   def "finds the AMI and artifact created by a bake"() {
     given:
@@ -105,7 +106,7 @@ class CompletedBakeTaskSpec extends Specification {
 
     then:
     1 * task.bakerySelector.select(_) >> selectedBakeryService
-    thrown(RetrofitError)
+    thrown(SpinnakerHttpException)
 
     where:
     region = "us-west-1"

orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/PinServerGroupStage.groovy

@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup
 
+import com.netflix.spinnaker.orca.api.pipeline.graph.StageDefinitionBuilder
 import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution
 import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroupLinearStageSupport
 import com.netflix.spinnaker.orca.clouddriver.tasks.MonitorKatoTask
@@ -38,7 +39,7 @@ import org.springframework.stereotype.Component
 @Component
 @Slf4j
 class PinServerGroupStage extends TargetServerGroupLinearStageSupport {
-  public static final String TYPE = getType(PinServerGroupStage)
+  public static final String TYPE = StageDefinitionBuilder.getType(PinServerGroupStage)
 
   @Override
   protected void taskGraphInternal(StageExecution stage, TaskNode.Builder builder) {

orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/ResizeServerGroupStage.groovy

@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup
 
+import com.netflix.spinnaker.orca.api.pipeline.graph.StageDefinitionBuilder
 import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution
 import com.netflix.spinnaker.orca.clouddriver.pipeline.providers.aws.ModifyAwsScalingProcessStage
 import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroupLinearStageSupport
@@ -37,7 +38,7 @@ import org.springframework.stereotype.Component
 @Component
 @Slf4j
 class ResizeServerGroupStage extends TargetServerGroupLinearStageSupport {
-  public static final String TYPE = getType(ResizeServerGroupStage)
+  public static final String TYPE = StageDefinitionBuilder.getType(ResizeServerGroupStage)
 
   @Override
   protected void taskGraphInternal(StageExecution stage, TaskNode.Builder builder) {

orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/support/TargetServerGroupResolver.groovy

@@ -26,7 +26,6 @@ import com.netflix.spinnaker.orca.clouddriver.model.ServerGroup
 import groovy.util.logging.Slf4j
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
-import retrofit.RetrofitError
 
 import java.time.Duration