docker: fix script check execution #24098
Merged
+3
−11
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
In #24095 we made a fix for non-streaming exec into Docker tasks for script checks and `change_mode = "script"`, but didn't complete E2E testing. We need to use `ContainerExecAttach` in the new API in order to get stdout/stderr from tasklets, but the previous `ContainerExecStart` call will prevent this from running successfully with an error that the exec has already run. * Ref: [NET-11202 (comment)](https://hashicorp.atlassian.net/browse/NET-11202?focusedCommentId=551618) * This has shipped in Nomad 1.9.0-beta.1 but not production yet. * This should fix the remaining issues in nightly E2E for Docker.
tgross
commented
Oct 1, 2024
| @@ -48,7 +48,6 @@ job "test" { | |||
| on_update = "ignore_warnings" | |||
|
|
|||
| args = [ | |||
| "-c", | |||
There was a problem hiding this comment.
This was causing the wrong error code because -c means "run this script literal", not "run this script file".
gulducat
approved these changes
Oct 1, 2024
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.
In #24095 we made a fix for non-streaming exec into Docker tasks for script checks and
change_mode = "script", but didn't complete E2E testing. We need to useContainerExecAttachin the new API in order to get stdout/stderr from tasklets, but the previousContainerExecStartcall will prevent this from running successfully with an error that the exec has already run.Note for reviewers: at this point the
(*taskHandle).Execand(*driver).ExecTaskStreamingare similar enough that I suspect we could at least partially merge them, but I'm trying to avoid adding more churn to this code during the beta window. I'd also like to fix this more universally for other driver authors when we tackle NET-11219E2E run of the currently-failing tests: