Support stepTemplate alongside script mode #1653
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
MergeStepsWithStepTemplate now takes into account a step Script, instead of zeroing it out. There's still room for improvement here; Merge can happen after script conversion, if script mode is able to accept template-provided args.
googlebot
added
the
cla: yes
tekton-robot
added
the
size/M
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: vdemeester The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
tekton-robot
added
the
approved
3 tasks
bobcatfish
reviewed
Dec 3, 2019
| @@ -84,7 +84,8 @@ func MergeStepsWithStepTemplate(template *v1.Container, steps []Step) ([]Step, e | |||
| merged.Args = []string{} | |||
| } | |||
|
|
|||
| steps[i] = Step{Container: *merged} | |||
| // Pass through original step Script, for later conversion. | |||
| steps[i] = Step{Container: *merged, Script: s.Script} | |||
There was a problem hiding this comment.
coming in late to the party, but it looks like we have merge_test.go, probs makes sense to add a test case for this?
| steps[i].Command = []string{tmpFile} | ||
| steps[i].Args = nil // TODO(#1652): Don't overwrite this. |
There was a problem hiding this comment.
similarly for this, can has unit test in script_test.go?
imjasonh
added a commit
to imjasonh/pipeline
that referenced
this pull request
Dec 3, 2019
Adds tests for script preservation and args alongside scripts
tekton-robot
pushed a commit
that referenced
this pull request
Dec 3, 2019
Adds tests for script preservation and args alongside scripts
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.
MergeStepsWithStepTemplatenow takes into account a step Script, insteadof zeroing it out.
There's still room for improvement here; Merge can happen after script
conversion, if script mode is able to accept template-provided args (#1652)
Fixes #1647
Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.