Add spotVM and maxRunDuration feature to VM provisioning #492
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright 2024 CloudBees, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.jenkins.plugins.computeengine.config; | ||
|
|
||
| import com.google.api.services.compute.model.Scheduling; | ||
| import hudson.Extension; | ||
| import org.kohsuke.stapler.DataBoundConstructor; | ||
|
|
||
| public class PreemptibleVm extends ProvisioningType { | ||
|
|
||
| @DataBoundConstructor | ||
| public PreemptibleVm() {} | ||
|
|
||
| @Override | ||
| public void configure(Scheduling scheduling) { | ||
| scheduling.setPreemptible(true); | ||
| } | ||
|
|
||
| @Extension | ||
| public static class DescriptorImpl extends ProvisioningTypeDescriptor { | ||
| @Override | ||
| public String getDisplayName() { | ||
| return "Preemptible VM"; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isMaxRunDurationSupported() { | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Copyright 2024 CloudBees, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.jenkins.plugins.computeengine.config; | ||
|
|
||
| import com.google.api.client.json.GenericJson; | ||
| import com.google.api.services.compute.model.Scheduling; | ||
| import hudson.model.AbstractDescribableImpl; | ||
| import hudson.model.Descriptor; | ||
|
|
||
| /** | ||
| * ProvisioningType represents the type of VM to be provisioned. | ||
| */ | ||
| public abstract class ProvisioningType extends AbstractDescribableImpl<ProvisioningType> { | ||
|
|
||
| protected void configureMaxRunDuration(Scheduling scheduling, long maxRunDurationSeconds) { | ||
| if (maxRunDurationSeconds > 0) { | ||
| GenericJson j = new GenericJson(); | ||
| j.set("seconds", maxRunDurationSeconds); | ||
| scheduling.set("maxRunDuration", j); | ||
| /* Note: Only the instance is set to delete here, not the disk. Disk deletion is based on the | ||
| `bootDiskAutoDelete` config value. For instance termination at `maxRunDuration`, GCP supports two | ||
| termination actions: DELETE and STOP. | ||
| For Jenkins agents, DELETE is more appropriate. If the agent instance is needed again, it can be | ||
| recreated using the disk, which should have been anticipated and disk should be set to not delete in | ||
| `bootDiskAutoDelete`. | ||
| */ | ||
| scheduling.setInstanceTerminationAction("DELETE"); | ||
| } | ||
| } | ||
|
|
||
| public abstract void configure(Scheduling scheduling); | ||
|
|
||
| public abstract static class ProvisioningTypeDescriptor extends Descriptor<ProvisioningType> { | ||
|
|
||
| @SuppressWarnings("unused") // jelly | ||
| public abstract boolean isMaxRunDurationSupported(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright 2024 CloudBees, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.jenkins.plugins.computeengine.config; | ||
|
|
||
| import com.google.api.services.compute.model.Scheduling; | ||
| import hudson.Extension; | ||
| import hudson.util.FormValidation; | ||
| import org.kohsuke.stapler.DataBoundConstructor; | ||
| import org.kohsuke.stapler.DataBoundSetter; | ||
| import org.kohsuke.stapler.QueryParameter; | ||
|
|
||
| public class SpotVm extends ProvisioningType { | ||
|
|
||
| private long maxRunDurationSeconds; | ||
|
|
||
| // required for casc | ||
| @DataBoundConstructor | ||
| public SpotVm(long maxRunDurationSeconds) { | ||
| this.maxRunDurationSeconds = maxRunDurationSeconds; | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") // jelly | ||
| @DataBoundSetter | ||
| public void setMaxRunDurationSeconds(long maxRunDurationSeconds) { | ||
| this.maxRunDurationSeconds = maxRunDurationSeconds; | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") // jelly | ||
| public long getMaxRunDurationSeconds() { | ||
| return maxRunDurationSeconds; | ||
| } | ||
|
|
||
| @Override | ||
| public void configure(Scheduling scheduling) { | ||
| scheduling.setProvisioningModel("SPOT"); | ||
| super.configureMaxRunDuration(scheduling, maxRunDurationSeconds); | ||
| } | ||
|
|
||
| @Extension | ||
| public static class DescriptorImpl extends ProvisioningTypeDescriptor { | ||
| @Override | ||
| public String getDisplayName() { | ||
| return "Spot VM"; | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") // jelly | ||
| public FormValidation doCheckMaxRunDurationSeconds(@QueryParameter String value) { | ||
|
Check warning Code scanning / Jenkins Security Scan Stapler: Missing POST/RequirePOST annotation Warning Check warning Code scanning / Jenkins Security Scan Stapler: Missing permission check Warning |
||
| return Utils.doCheckMaxRunDurationSeconds(value); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isMaxRunDurationSupported() { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Copyright 2024 CloudBees, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.jenkins.plugins.computeengine.config; | ||
|
|
||
| import com.google.api.services.compute.model.Scheduling; | ||
| import hudson.Extension; | ||
| import hudson.util.FormValidation; | ||
| import org.kohsuke.stapler.DataBoundConstructor; | ||
| import org.kohsuke.stapler.DataBoundSetter; | ||
| import org.kohsuke.stapler.QueryParameter; | ||
|
|
||
| public class Standard extends ProvisioningType { | ||
|
|
||
| private long maxRunDurationSeconds; | ||
|
|
||
| // required for casc | ||
| @DataBoundConstructor | ||
| public Standard(long maxRunDurationSeconds) { | ||
| this.maxRunDurationSeconds = maxRunDurationSeconds; | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") // jelly | ||
| @DataBoundSetter | ||
| public void setMaxRunDurationSeconds(long maxRunDurationSeconds) { | ||
| this.maxRunDurationSeconds = maxRunDurationSeconds; | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") // jelly | ||
| public long getMaxRunDurationSeconds() { | ||
| return maxRunDurationSeconds; | ||
| } | ||
|
|
||
| @Override | ||
| public void configure(Scheduling scheduling) { | ||
| super.configureMaxRunDuration(scheduling, maxRunDurationSeconds); | ||
| } | ||
|
|
||
| @Extension | ||
| public static class DescriptorImpl extends ProvisioningTypeDescriptor { | ||
| @Override | ||
| public String getDisplayName() { | ||
| return "Standard"; | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") // jelly | ||
| public FormValidation doCheckMaxRunDurationSeconds(@QueryParameter String value) { | ||
|
Check warning Code scanning / Jenkins Security Scan Stapler: Missing POST/RequirePOST annotation Warning Check warning Code scanning / Jenkins Security Scan Stapler: Missing permission check Warning |
||
| return Utils.doCheckMaxRunDurationSeconds(value); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isMaxRunDurationSupported() { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These pom dependencies will be removed after merging #495
currently keeping here, otherwise compilation will fail in CI