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.
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
[JENKINS-66986] Allow non kubernetes nodes to be provisioned inside the container clause #1087
Merged
Conversation
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
Vlatombe
reviewed
Dec 10, 2021
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.
Looks good overall. Can be simplified though.
src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java
Outdated
Show resolved
Hide resolved
src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorTest.java
Outdated
Show resolved
Hide resolved
src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorTest.java
Outdated
Show resolved
Hide resolved
…/ContainerExecDecoratorTest.java Co-authored-by: Vincent Latombe <vincent@latombe.net>
…/ContainerExecDecorator.java Co-authored-by: Vincent Latombe <vincent@latombe.net>
…/ContainerExecDecoratorTest.java Co-authored-by: Vincent Latombe <vincent@latombe.net>
Vlatombe
changed the title
Allow non kubernetes nodes to be provisioned inside the container clause
[JENKINS-66986] Allow non kubernetes nodes to be provisioned inside the container clause
Dec 10, 2021
Vlatombe
approved these changes
Dec 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description:
When a non Kubernetes node is provisioned inside the container clause the steps executions fail because it is trying to cast a DumbSlave to KubernetesSlave - https://github.com/jenkinsci/kubernetes-plugin/blob/master/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java#L255. I added a check and if the node is not an instance of KubernetesSlave it just returns the original launcher.
JIRA Link: https://issues.jenkins.io/browse/JENKINS-66986
No upstream or downstream changes.
Before change
After change