Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WX-767 Upgrade Cloud SDK to 461.0.0 #7361

Merged
merged 2 commits into from
Jan 31, 2024
Merged

WX-767 Upgrade Cloud SDK to 461.0.0 #7361

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4deecd
Upgrade Cloud SDK to 461.0.0
aednichols Jan 29, 2024
da19ff0
Merge branch 'develop' into aen_wx_767_sdk_upgrade_only
aednichols Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions ...ds/google/batch/src/main/scala/cromwell/backend/google/batch/runnable/RunnableUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,16 @@
/** Port mappings for the ssh container. */
val sshPortMappings = Map("22" -> Int.box(22))

/*
* At the moment, cloud-sdk (924MB for 276.0.0-slim) and stedolan/jq (182MB) decompressed ~= 1.1 GB
*/
val cromwellImagesSizeRoundedUpInGB = 1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we're removing all the image size stuff from RunnableUtils, is that right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The variable is unused. I bugged Dan Speck just now to confirm that is deliberate.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmation received (requires auth)


private val config = ConfigFactory.load().getConfig("google")

/**
* An image with the Google Cloud SDK installed.
* http://gcr.io/google.com/cloudsdktool/cloud-sdk
*
* FYI additional older versions are available on DockerHub at:
* https://hub.docker.com/r/google/cloud-sdk
*
* When updating this value, also consider updating the CromwellImagesSizeRoundedUpInGB below.
* Also update `cromwell.backend.google.pipelines.common.action.ActionUtils`
*/
val CloudSdkImage: String =
// config.getOrElse("cloud-sdk-image-url", "gcr.io/google.com/cloudsdktool/cloud-sdk:354.0.0-alpine")
config.getOrElse("cloud-sdk-image-url", "gcr.io/google.com/cloudsdktool/cloud-sdk:434.0.0-alpine")
/*
* At the moment, cloud-sdk (584MB for 354.0.0-alpine) and stedolan/jq (182MB) decompressed ~= 0.8 GB
*/
val CromwellImagesSizeRoundedUpInGB: Int =
config.getOrElse("cloud-sdk-image-size-gb", 1)
config.getOrElse("cloud-sdk-image-url", "gcr.io/google.com/cloudsdktool/cloud-sdk:461.0.0-alpine")

Check warning on line 28 in supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/runnable/RunnableUtils.scala

View check run for this annotation

Codecov / codecov/patch

supportedBackends/google/batch/src/main/scala/cromwell/backend/google/batch/runnable/RunnableUtils.scala#L28 

Added line #L28 was not covered by tests

/** Quotes a string such that it's compatible as a string argument in the shell. */
def shellEscaped(any: Any): String = {
Expand Down
17 changes: 5 additions & 12 deletions ...s/common/src/main/scala/cromwell/backend/google/pipelines/common/action/ActionUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,23 @@ object ActionUtils {
/** Port mappings for the ssh container. */
val sshPortMappings = Map("22" -> Int.box(22))

/*
* At the moment, cloud-sdk (924MB for 276.0.0-slim) and stedolan/jq (182MB) decompressed ~= 1.1 GB
*/
val cromwellImagesSizeRoundedUpInGB = 1

private val config = ConfigFactory.load().getConfig("google")

/**
* An image with the Google Cloud SDK installed.
* http://gcr.io/google.com/cloudsdktool/cloud-sdk
*
* FYI additional older versions are available on DockerHub at:
* https://hub.docker.com/r/google/cloud-sdk
* When updating this value, also consider updating the `cromwellImagesSizeRoundedUpInGB` below.
*
* When updating this value, also consider updating the CromwellImagesSizeRoundedUpInGB below.
* Also update `cromwell.backend.google.batch.runnable.RunnableUtils`
*/
val CloudSdkImage: String =
config.getOrElse("cloud-sdk-image-url", "gcr.io/google.com/cloudsdktool/cloud-sdk:354.0.0-alpine")
config.getOrElse("cloud-sdk-image-url", "gcr.io/google.com/cloudsdktool/cloud-sdk:461.0.0-alpine")

/*
* At the moment, cloud-sdk (584MB for 354.0.0-alpine) and stedolan/jq (182MB) decompressed ~= 0.8 GB
* At the moment, cloud-sdk (955MB for 460.0.0-alpine) ~= 1.0 GB
*/
val CromwellImagesSizeRoundedUpInGB: Int =
config.getOrElse("cloud-sdk-image-size-gb", 1)
val cromwellImagesSizeRoundedUpInGB: Int = config.getOrElse("cloud-sdk-image-size-gb", 1)

/** Quotes a string such that it's compatible as a string argument in the shell. */
def shellEscaped(any: Any): String = {
Expand Down
Loading