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

Ensuring all data on pod template is copied during combine #319

Merged
merged 1 commit into from May 22, 2018

Conversation

Projects
None yet
2 participants
@farley13

farley13 commented May 3, 2018

Really 3 things going on in this diff:

  1. I found that setting idle timeout wasn't keeping slaves around - they'd get killed once each job finished. Tracking this down - it turned out combine ( PodTemplate, PodTemplate ) was creating a new object to copy data into but was copying an incomplete set of data in - dropping a number of fields. These are now copied in similar to the existing fields - preferring template over parent.
  2. Added some logging in combine for PodTemplate to mimic what already existed for combine for Pod.
  3. Added a simple unit test for the remaining non-deprecated fields on PodTemplate.

@carlossg carlossg merged commit f02a099 into jenkinsci:master May 22, 2018

1 of 2 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment