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

allow setting the service account email when creating a google batch CE #426

Merged
merged 2 commits into from
Sep 11, 2024
Merged

allow setting the service account email when creating a google batch CE #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
def1f95
allow setting the service account email when creating a google batch CE
JaimeSeqLabs Jun 24, 2024
b709ef6
chore: solve conflicts
tcrespog Sep 11, 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
2 changes: 1 addition & 1 deletion .sdkmanrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=17.0.8-graalce
java=21.0.4-graal
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not a CE version of the VM.

Copy link
Contributor

Choose a reason for hiding this comment

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

It seems Java 21 is being used as of recently. In GitHub Actions, we are using GraalVM 21 "non-CE" too. Here, I've just updated .sdkmanrc to align them accordingly. In fact, with GraalVM 21 CE it doesn't seem to work.

image

I'll start a discussion about this.

Copy link
Contributor

Choose a reason for hiding this comment

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

We can use it under the new Graalvm license

Subject to the conditions in the license, including the License for Early Adopter Versions, the GFTC is intended to permit use by any user including commercial and production use. Redistribution is permitted as long as it is not for a fee

https://www.graalvm.org/faq/

13 changes: 9 additions & 4 deletions src/main/java/io/seqera/tower/cli/commands/computeenvs/platforms/GoogleBatchPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@ public GoogleBatchConfig computeConfig() throws ApiException, IOException {
// Advanced
if (adv != null) {
config
.usePrivateAddress(adv.usePrivateAddress)
.bootDiskSizeGb(adv.bootDiskSizeGb)
.headJobCpus(adv.headJobCpus)
.headJobMemoryMb(adv.headJobMemoryMb);
.usePrivateAddress(adv.usePrivateAddress)
.bootDiskSizeGb(adv.bootDiskSizeGb)
.headJobCpus(adv.headJobCpus)
.headJobMemoryMb(adv.headJobMemoryMb)
.serviceAccount(adv.serviceAccountEmail);
}

return config;
Expand All @@ -87,5 +88,9 @@ public static class AdvancedOptions {

@Option(names = {"--head-job-memory"}, description = "The number of MiB of memory reserved for the Nextflow runner job (value should be a multiple of 256MiB and from 0.5 GB to 8 GB per CPU).")
public Integer headJobMemoryMb;

@Option(names = {"--service-account-email"}, description = "The service account email address used when deploying pipeline executions with this compute environment.")
public String serviceAccountEmail;

}
}
Loading