diff --git a/automation/src/test/resources/reference.conf b/automation/src/test/resources/reference.conf index 26f4388785c..62694dd0290 100644 --- a/automation/src/test/resources/reference.conf +++ b/automation/src/test/resources/reference.conf @@ -1,10 +1,10 @@ leonardo { - rImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5" - pythonImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5" - hailImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.12" - gatkImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.7" - aouImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13" - baseImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.3" + rImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.6" + pythonImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.6" + hailImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.13" + gatkImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.8" + aouImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.14" + baseImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.4" gcrWelderUri = "us.gcr.io/broad-dsp-gcr-public/welder-server" dockerHubWelderUri = "broadinstitute/welder-server" rstudioBioconductorImageUrl = "us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.19.0" diff --git a/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/RuntimeFixtureSpec.scala b/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/RuntimeFixtureSpec.scala index ba9d58b7f33..29253cb5709 100644 --- a/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/RuntimeFixtureSpec.scala +++ b/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/RuntimeFixtureSpec.scala @@ -227,7 +227,7 @@ object RuntimeFixtureSpec { case CloudService.Dataproc => RuntimeConfigRequest.DataprocConfig( numberOfWorkers = Some(0), - masterDiskSize = Some(DiskSize(130)), + masterDiskSize = Some(DiskSize(150)), masterMachineType = Some(MachineTypeName("n1-standard-8")), workerMachineType = Some(MachineTypeName("n1-standard-8")), workerDiskSize = None, diff --git a/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/runtimes/RuntimeDataprocSpec.scala b/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/runtimes/RuntimeDataprocSpec.scala index 928fc8bfb8d..ca3bcf5e442 100644 --- a/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/runtimes/RuntimeDataprocSpec.scala +++ b/automation/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/runtimes/RuntimeDataprocSpec.scala @@ -95,7 +95,7 @@ class RuntimeDataprocSpec extends BillingProjectFixtureSpec with ParallelTestExe RuntimeConfigRequest.DataprocConfig( Some(2), Some(MachineTypeName("n1-standard-4")), - Some(DiskSize(130)), + Some(DiskSize(150)), Some(MachineTypeName("n1-standard-4")), Some(DiskSize(150)), None, @@ -158,7 +158,7 @@ class RuntimeDataprocSpec extends BillingProjectFixtureSpec with ParallelTestExe RuntimeConfigRequest.DataprocConfig( Some(2), Some(MachineTypeName("n1-standard-4")), - Some(DiskSize(130)), + Some(DiskSize(150)), Some(MachineTypeName("n1-standard-4")), Some(DiskSize(150)), None, diff --git a/http/src/main/resources/reference.conf b/http/src/main/resources/reference.conf index c490a320c62..7ba90121388 100644 --- a/http/src/main/resources/reference.conf +++ b/http/src/main/resources/reference.conf @@ -61,7 +61,7 @@ dataproc { runtimeDefaults { numberOfWorkers = 0 masterMachineType = "n1-standard-4" - masterDiskSize = 130 + masterDiskSize = 150 workerMachineType = "n1-standard-4" workerDiskSize = 150 numberOfWorkerLocalSSDs = 0 @@ -70,7 +70,7 @@ dataproc { } # Cached dataproc image used by Terra - customDataprocImage = "projects/broad-dsp-gcr-public/global/images/leo-dataproc-image-2-1-11-debian11-2024-08-13-15-17-08" + customDataprocImage = "projects/broad-dsp-gcr-public/global/images/leo-dataproc-image-2-1-11-debian11-2024-09-17-19-26-31" # The ratio of memory allocated to spark. 0.8 = 80%. # Hail/Spark users generally allocate 80% of the ram to the JVM. @@ -111,7 +111,7 @@ dataproc { } gce { - customGceImage = "projects/broad-dsp-gcr-public/global/images/leo-gce-image-2024-08-14-15-03-19" + customGceImage = "projects/broad-dsp-gcr-public/global/images/leo-gce-image-2024-09-16-18-37-18" userDiskDeviceName = "user-disk" defaultScopes = [ "https://www.googleapis.com/auth/userinfo.email", diff --git a/jenkins/dataproc-custom-images/create_dataproc_image.sh b/jenkins/dataproc-custom-images/create_dataproc_image.sh index 4f04f113488..54bdb3dda7b 100755 --- a/jenkins/dataproc-custom-images/create_dataproc_image.sh +++ b/jenkins/dataproc-custom-images/create_dataproc_image.sh @@ -41,7 +41,7 @@ python generate_custom_image.py \ --zone $ZONE \ --gcs-bucket $DATAPROC_IMAGE_BUCKET \ --project-id=$GOOGLE_PROJECT \ - --disk-size=120 + --disk-size=150 if ! [ -z "$OUTPUT_FILE_PATH" ]; then echo "projects/$GOOGLE_PROJECT/global/images/$OUTPUT_IMAGE_NAME" > $OUTPUT_FILE_PATH diff --git a/jenkins/dataproc-custom-images/prepare-custom-leonardo-jupyter-dataproc-image.sh b/jenkins/dataproc-custom-images/prepare-custom-leonardo-jupyter-dataproc-image.sh index ea8b4679876..f617693b75b 100755 --- a/jenkins/dataproc-custom-images/prepare-custom-leonardo-jupyter-dataproc-image.sh +++ b/jenkins/dataproc-custom-images/prepare-custom-leonardo-jupyter-dataproc-image.sh @@ -16,18 +16,18 @@ set -e -x # the image tags are set via jenkins automation # -terra_jupyter_python="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5" -terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5" -terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.5" -terra_jupyter_hail="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.12" -terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.7" -terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13" +terra_jupyter_python="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.6" +terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.6" +terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.6" +terra_jupyter_hail="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.13" +terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.8" +terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.14" welder_server="us.gcr.io/broad-dsp-gcr-public/welder-server:8667bfe" openidc_proxy="broadinstitute/openidc-proxy:2.3.1_2" anvil_rstudio_bioconductor="us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.19.0" # Note that this is the version used currently by AOU in production, the one above can be staged for testing -terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.7" +terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13" # If you change this you must also change Leo reference.conf! cryptomining_detector="us.gcr.io/broad-dsp-gcr-public/cryptomining-detector:0.0.2" diff --git a/jenkins/gce-custom-images/prepare_gce_image.sh b/jenkins/gce-custom-images/prepare_gce_image.sh index 263ccf373c3..559fc5d3bca 100755 --- a/jenkins/gce-custom-images/prepare_gce_image.sh +++ b/jenkins/gce-custom-images/prepare_gce_image.sh @@ -16,17 +16,17 @@ set -e -x # Constants and Global Vars # -terra_jupyter_python="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5" -terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5" -terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.5" -terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.7" -terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13" +terra_jupyter_python="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.6" +terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.6" +terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.6" +terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.8" +terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.14" welder_server="us.gcr.io/broad-dsp-gcr-public/welder-server:8667bfe" openidc_proxy="broadinstitute/openidc-proxy:2.3.1_2" anvil_rstudio_bioconductor="us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.19.0" # Note that this is the version used currently by AOU in production, the one above can be staged for testing -terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.7" +terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13" cos_gpu_installer="gcr.io/cos-cloud/cos-gpu-installer:v2.1.9" google_cloud_toolbox="us.gcr.io/cos-cloud/toolbox:v20230714"