Skip to content

Commit 4bfd563

Browse files
authored
[AN-304] Bioconductor 3.20.0 image update (#4807)
1 parent efdd655 commit 4bfd563

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

automation/src/test/resources/reference.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
leonardo {
2-
rImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5"
2+
rImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.6"
33
pythonImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5"
44
hailImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.12"
5-
gatkImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.7"
6-
aouImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13"
5+
gatkImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.8"
6+
aouImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.14"
77
baseImageUrl = "us.gcr.io/broad-dsp-gcr-public/terra-jupyter-base:1.1.3"
88
gcrWelderUri = "us.gcr.io/broad-dsp-gcr-public/welder-server"
99
dockerHubWelderUri = "broadinstitute/welder-server"
10-
rstudioBioconductorImageUrl = "us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.19.0"
10+
rstudioBioconductorImageUrl = "us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.20.0"
1111
//each fiab will have a unique topic name sourced from leonardo.conf, this is never published to in automation tests to ensure pub/sub components can auth properly, but never read from to avoid conflicts.
1212
topicName = "leonardo-pubsub-test"
1313
location = "us-central1-a"

http/src/main/resources/reference.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dataproc {
7070
}
7171

7272
# Cached dataproc image used by Terra
73-
customDataprocImage = "projects/broad-dsp-gcr-public/global/images/leo-dataproc-image-2-1-11-debian11-2024-11-26-16-42-58"
73+
customDataprocImage = "projects/broad-dsp-gcr-public/global/images/leo-dataproc-image-2-1-11-debian11-2024-12-06-04-19-37"
7474

7575
# The ratio of memory allocated to spark. 0.8 = 80%.
7676
# Hail/Spark users generally allocate 80% of the ram to the JVM.
@@ -111,7 +111,7 @@ dataproc {
111111
}
112112

113113
gce {
114-
customGceImage = "projects/broad-dsp-gcr-public/global/images/leo-gce-image-2024-08-14-15-03-19"
114+
customGceImage = "projects/broad-dsp-gcr-public/global/images/leo-gce-image-2024-12-06-03-09-27"
115115
userDiskDeviceName = "user-disk"
116116
defaultScopes = [
117117
"https://www.googleapis.com/auth/userinfo.email",

jenkins/dataproc-custom-images/prepare-custom-leonardo-jupyter-dataproc-image.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ set -e -x
1717
#
1818

1919
terra_jupyter_python="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5"
20-
terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5"
21-
terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.5"
20+
terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.6"
21+
terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.6"
2222
terra_jupyter_hail="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-hail:1.1.12"
23-
terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.7"
24-
terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13"
23+
terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.8"
24+
terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.14"
2525
welder_server="us.gcr.io/broad-dsp-gcr-public/welder-server:8667bfe"
2626
openidc_proxy="broadinstitute/openidc-proxy:2.3.1_2"
27-
anvil_rstudio_bioconductor="us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.19.0"
27+
anvil_rstudio_bioconductor="us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.20.0"
2828

2929
# Note that this is the version used currently by AOU in production, the one above can be staged for testing
3030
terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13"

jenkins/gce-custom-images/prepare_gce_image.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ set -e -x
1717
#
1818

1919
terra_jupyter_python="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-python:1.1.5"
20-
terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.5"
21-
terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.5"
22-
terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.7"
23-
terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13"
20+
terra_jupyter_r="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-r:2.2.6"
21+
terra_jupyter_bioconductor="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-bioconductor:2.2.6"
22+
terra_jupyter_gatk="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-gatk:2.3.8"
23+
terra_jupyter_aou="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.14"
2424
welder_server="us.gcr.io/broad-dsp-gcr-public/welder-server:8667bfe"
2525
openidc_proxy="broadinstitute/openidc-proxy:2.3.1_2"
26-
anvil_rstudio_bioconductor="us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.19.0"
26+
anvil_rstudio_bioconductor="us.gcr.io/broad-dsp-gcr-public/anvil-rstudio-bioconductor:3.20.0"
2727

2828
# Note that this is the version used currently by AOU in production, the one above can be staged for testing
2929
terra_jupyter_aou_old="us.gcr.io/broad-dsp-gcr-public/terra-jupyter-aou:2.2.13"

0 commit comments

Comments
 (0)