Skip to content

Commit 0641a36

Browse files
authored
[AN-304] Point to latest rstudio bioconductor image with fix (3.20.1) (#4815)
1 parent 6c3447c commit 0641a36

File tree

13 files changed

+17
-16
lines changed

13 files changed

+17
-16
lines changed

.github/workflows/azure_automation_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
outputs:
163163
project-name: ${{ steps.gen.outputs.project_name }}
164164
steps:
165-
- uses: 'actions/checkout@v3'
165+
- uses: 'actions/checkout@v4'
166166

167167
- name: Generate a random billing project name
168168
id: 'gen'

.github/workflows/consumer_contract_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
fork: ${{ steps.extract-branch.outputs.fork }}
9595

9696
steps:
97-
- uses: actions/checkout@v3
97+
- uses: actions/checkout@v4
9898

9999
- name: Obtain branch properties
100100
id: extract-branch
@@ -137,7 +137,7 @@ jobs:
137137
pact-b64: ${{ steps.encode-pact.outputs.pact-b64 }}
138138

139139
steps:
140-
- uses: actions/checkout@v3
140+
- uses: actions/checkout@v4
141141
- name: Run consumer tests
142142
run: |
143143
docker run --rm -v $PWD:/working \

.github/workflows/custom_image_generation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
OUTPUT_FILE_RELATIVE_PATH: jenkins/gce-custom-images/output.txt
3535

3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838

3939
- id: 'auth'
4040
name: 'Authenticate to Google Cloud'
@@ -81,7 +81,7 @@ jobs:
8181
DATAPROC_IMAGE_BUCKET: gs://leo-dataproc-image-creation-logs
8282

8383
steps:
84-
- uses: actions/checkout@v3
84+
- uses: actions/checkout@v4
8585

8686
- id: 'auth'
8787
name: 'Authenticate to Google Cloud'

.github/workflows/publish_java_client.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ jobs:
2929
SBT_OPTS: -Xmx3g
3030

3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
33+
- uses: sbt/setup-sbt@v1
3334

3435
# coursier cache action caches both coursier and sbt caches
3536
- name: coursier-cache-action

.github/workflows/tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
new-tag: ${{ steps.tag.outputs.new_tag }}
4747
steps:
4848
- name: Checkout current code
49-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
5050
with:
5151
ref: ${{ inputs.ref }}
5252
token: ${{ secrets.BROADBOT_TOKEN }} # this allows the push to succeed later

.github/workflows/trivy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: DSP AppSec Trivy check
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111

1212
# The Dockerfile copies this, so it needs
1313
# to exist for the build to succeed

.github/workflows/unit_test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
- 3307:3306
3737

3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
40+
- uses: sbt/setup-sbt@v1
4041

4142
- name: Set up JDK 17
4243
uses: actions/setup-java@v3

.github/workflows/verify_consumer_contracts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107

108108
steps:
109109
- name: Checkout current code
110-
uses: actions/checkout@v3
110+
uses: actions/checkout@v4
111111
with:
112112
fetch-depth: 0
113113

automation/src/test/resources/reference.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ leonardo {
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.1"
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-12-11-20-54-48"
73+
customDataprocImage = "projects/broad-dsp-gcr-public/global/images/leo-dataproc-image-2-1-11-debian11-2024-12-16-17-22-28"
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-12-11-20-55-03"
114+
customGceImage = "projects/broad-dsp-gcr-public/global/images/leo-gce-image-2024-12-16-17-22-39"
115115
userDiskDeviceName = "user-disk"
116116
defaultScopes = [
117117
"https://www.googleapis.com/auth/userinfo.email",

0 commit comments

Comments
 (0)