Allow valid agent types in PCT context #660
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
basil
commented
Aug 24, 2023
| @@ -223,7 +226,7 @@ public static Iterable<Object[]> configsWithErrors() { | |||
| result.add(new Object[]{"invalidWrapperType", "Invalid option type \"echo\". Valid option types:"}); | |||
| result.add(new Object[]{"invalidStageWrapperType", "Invalid option type \"echo\". Valid option types:"}); | |||
|
|
|||
| result.add(new Object[]{"unknownBareAgentType", Messages.ModelValidatorImpl_InvalidAgentType("foo", legalAgentTypes)}); | |||
| result.add(new Object[]{"unknownBareAgentType", Messages.ModelValidatorImpl_InvalidAgentType("foo", "[any, label, none, otherField]")}); | |||
There was a problem hiding this comment.
Newly consistent with unknownAgentType in the sense that both now hardcode a list of agent types rather than using legalAgentTypes, which is not yet initialized when this code is running.
|
Currently blocking jenkinsci/bom#2417 |
|
Currently blocking jenkinsci/bom#2453 |
|
Currently blocking jenkinsci/bom#2453 |
jglick
approved these changes
Jan 3, 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.
While trying to add the Kubernetes plugins to
jenkinsci/bomin jenkinsci/bom#2417 I got some test failures of the form:The existing test logic had tried to deal with this case by defining a
legalAgentTypesfield, but it was flawed in a few ways:AbstractModelDefTest#configsWithErrors:unknownBareAgentTypeused it but notunknownAgentTypelegalAgentTypesfromAbstractModelDefTest#configsWithErrorswas flawed and yielding the empty string (thus making the test pass erroneously) because Jenkins had not been started when populating the list during JUnit parameterized test initializationThis PR fixes all three mistakes by:
legalAgentTypesinAbstractModelDefTest#configsWithErrors, since that is too early for it to be usedlegalAgentTypesuse it in the test itself, after Jenkins startup (currently this list includesErrorsEndpointOpsTest,ErrorsJSONParserTest, andValidatorTest)Testing done
To test this PR I reproduced the original problem by adding the Kubernetes plugins to the test classpath and verified the BOM error occurred. Next I applied the changes from this PR and verified the problem was fixed. Then I removed the Kubernetes plugins from the test classpath and verified the tests still passed in the non-PCT scenario.