[Backport release-1.33] Determine inttest configs from smoke test name#7012
Merged
twz123 merged 4 commits intok0sproject:release-1.33from Jan 22, 2026
Merged
Conversation
Instead of manually exporting the required environment variables in the Go test invocation, export the Make variables directly. This makes the command line easier to read. As an exception to this rule, introduce the new variable K0S_INTTEST_TARGET via the command line to make it clear which target is being executed. This will allow for the removal of some extra environment variables from the Makefile in the future because the tests can simply use the value of that variable to determine their configuration. Deduce K0S_PATH from the current directory if it is not set. This eliminates the need to define K0S_PATH in every case and relies on the fact that the inttests are always executed with the working directory set to their source directory. Move the K0S_UPDATE_TO_VERSION definition to the ap-ha3x3 inttest, which is the only one that needs it. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit fb3e54e)
If not specified explicitly, the inttest package to be executed will be determined by the longest prefix of the target name for which a directory exists. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit 6e780b7)
This allows for removing a lot of config switches from the Makefile. Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit 2af8dd0)
Signed-off-by: Tom Wieczorek <[email protected]> (cherry picked from commit 49bc26a)
juanluisvaladas
approved these changes
Jan 22, 2026
Contributor
|
Successfully created backport PR for |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backport to
release-1.33:This is a prerequisite for: