Branch: refs/heads/master
Home: https://github.com/jenkinsci/pipeline-model-definition-plugin
Commit: da36bda7711bc66d056064ee8fbcde26d5cd561c
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/da36bda7711bc66d056064ee8fbcde26d5cd561c
Author: Andrew Bayer <[email protected]>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
A
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenCondition.java
A
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenContent.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenExpression.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
M pipeline-model-api/src/main/resources/ast-schema.json
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/StageConditionals.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AndConditional.java
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditional.java
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/OrConditional.java
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/Messages.properties
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/StageConditionalTranslator.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AndConditionalScript.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditionalScript.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/OrConditionalScript.groovy
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java
A pipeline-model-definition/src/test/resources/json/whenAnd.json
A pipeline-model-definition/src/test/resources/json/whenNot.json
A pipeline-model-definition/src/test/resources/json/whenOr.json
A pipeline-model-definition/src/test/resources/whenAnd.groovy
A pipeline-model-definition/src/test/resources/whenNot.groovy
A pipeline-model-definition/src/test/resources/whenOr.groovy
M
pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/DeclarativeStageConditionalDescriptor.java
Log Message:
-----------
[FIXED JENKINS-41185] Add support for and/not/or of when conditions
Commit: a0dad2de9f6e871c79df62a61230edbdf2eb95e3
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/a0dad2de9f6e871c79df62a61230edbdf2eb95e3
Author: Andrew Bayer <[email protected]>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java
A pipeline-model-definition/src/test/resources/whenNestedCombinations.groovy
Log Message:
-----------
Nested condition testing
Commit: 4584ce0918f5c88c176355cffd24f6350031d7d4
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/4584ce0918f5c88c176355cffd24f6350031d7d4
Author: Andrew Bayer <[email protected]>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AndConditional.java
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditional.java
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/OrConditional.java
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/Messages.properties
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
A
pipeline-model-definition/src/test/resources/errors/whenNestedChildrenInvalid.groovy
A pipeline-model-definition/src/test/resources/whenAndOrSingle.groovy
M
pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/DeclarativeStageConditionalDescriptor.java
Log Message:
-----------
Changes to nested checks
Wanted to make sure we could restrict/determine the number of children
for validation, so switched from boolean containsNested() to int
allowedNested(), which returns 0 for no nested conditions allowed, -1
for 1..n nested conditions allowed, and >0 for a specific number of
nested conditions allowed.
Commit: ceb8c9824d7ba278be95a383322eba617a8e8b14
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/ceb8c9824d7ba278be95a383322eba617a8e8b14
Author: Andrew Bayer <[email protected]>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllConditional.java
R
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AndConditional.java
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyConditional.java
R
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/OrConditional.java
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllConditionalScript.groovy
R
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AndConditionalScript.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyConditionalScript.groovy
R
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/OrConditionalScript.groovy
M
pipeline-model-definition/src/test/resources/errors/whenNestedChildrenInvalid.groovy
M pipeline-model-definition/src/test/resources/json/whenAnd.json
M pipeline-model-definition/src/test/resources/json/whenOr.json
M pipeline-model-definition/src/test/resources/whenAnd.groovy
M pipeline-model-definition/src/test/resources/whenAndOrSingle.groovy
M pipeline-model-definition/src/test/resources/whenNestedCombinations.groovy
M pipeline-model-definition/src/test/resources/whenOr.groovy
Log Message:
-----------
Renamed and->all and or->any
Commit: 54b969fc3873785b3fc884aafdf207476a33ce4c
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/54b969fc3873785b3fc884aafdf207476a33ce4c
Author: Andrew Bayer <[email protected]>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenCondition.java
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
R
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllConditional.java
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditional.java
R
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyConditional.java
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyOfConditional.java
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/StageConditionalTranslator.groovy
R
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllConditionalScript.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditionalScript.groovy
R
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyConditionalScript.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyOfConditionalScript.groovy
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ExecuteConvertedTest.java
M
pipeline-model-definition/src/test/resources/errors/whenNestedChildrenInvalid.groovy
M pipeline-model-definition/src/test/resources/json/whenAnd.json
M pipeline-model-definition/src/test/resources/json/whenOr.json
M pipeline-model-definition/src/test/resources/whenAnd.groovy
M pipeline-model-definition/src/test/resources/whenAndOrSingle.groovy
M pipeline-model-definition/src/test/resources/whenNestedCombinations.groovy
M pipeline-model-definition/src/test/resources/whenOr.groovy
Log Message:
-----------
Switch to anyOf/allOf due to conflict
Also using better describable resolution
Commit: a2d7d4d285120337a501ffa9e8fd035813262237
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/a2d7d4d285120337a501ffa9e8fd035813262237
Author: Andrew Bayer <[email protected]>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTBuildParameter.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTNamedArgumentList.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStep.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenCondition.java
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/StageConditionals.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditional.java
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyOfConditional.java
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditional.java
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
M
pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/DeclarativeStageConditionalDescriptor.java
Log Message:
-----------
Addressing some review comments
Commit: d91f654469f85c6d12703385d494e3875eaba0dc
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/d91f654469f85c6d12703385d494e3875eaba0dc
Author: Andrew Bayer <[email protected]>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
A
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTMarkerInterface.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTMethodArg.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenContent.java
M pipeline-model-api/src/main/resources/ast-schema.json
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/StageConditionals.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AbstractConditionalWithChildren.java
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditional.java
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyOfConditional.java
M
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditional.java
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/Messages.properties
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditionalScript.groovy
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditionalScript.groovy
M pipeline-model-definition/src/test/resources/json/basicWhen.json
M pipeline-model-definition/src/test/resources/json/errors/emptyWhen.json
M
pipeline-model-definition/src/test/resources/json/errors/unknownWhenConditional.json
M
pipeline-model-definition/src/test/resources/json/errors/whenInvalidParameterType.json
M
pipeline-model-definition/src/test/resources/json/errors/whenMissingRequiredParameter.json
M
pipeline-model-definition/src/test/resources/json/errors/whenUnknownParameter.json
M pipeline-model-definition/src/test/resources/json/skippedWhen.json
M pipeline-model-definition/src/test/resources/json/whenAnd.json
M pipeline-model-definition/src/test/resources/json/whenBranchFalse.json
M pipeline-model-definition/src/test/resources/json/whenEnvFalse.json
M pipeline-model-definition/src/test/resources/json/whenNot.json
M pipeline-model-definition/src/test/resources/json/whenOr.json
M
pipeline-model-definition/src/test/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgentScript.groovy
M
pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/DeclarativeStageConditionalDescriptor.java
Log Message:
-----------
Responding to review comments
Commit: ff76ce7cd7186d6e404ad7e851100df6e45258dc
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/ff76ce7cd7186d6e404ad7e851100df6e45258dc
Author: Andrew Bayer <[email protected]>
Date: 2017-03-09 (Thu, 09 Mar 2017)
Changed paths:
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTBuildParameter.java
A
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTMarkerInterface.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTMethodArg.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTNamedArgumentList.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStep.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java
A
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenCondition.java
A
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenContent.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhenExpression.java
M
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
M pipeline-model-api/src/main/resources/ast-schema.json
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/StageConditionals.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
M
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AbstractConditionalWithChildren.java
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditional.java
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyOfConditional.java
A
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditional.java
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/Messages.properties
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/StageConditionalTranslator.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AllOfConditionalScript.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/AnyOfConditionalScript.groovy
A
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/NotConditionalScript.groovy
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ExecuteConvertedTest.java
A
pipeline-model-definition/src/test/resources/errors/whenNestedChildrenInvalid.groovy
M pipeline-model-definition/src/test/resources/json/basicWhen.json
M pipeline-model-definition/src/test/resources/json/errors/emptyWhen.json
M
pipeline-model-definition/src/test/resources/json/errors/unknownWhenConditional.json
M
pipeline-model-definition/src/test/resources/json/errors/whenInvalidParameterType.json
M
pipeline-model-definition/src/test/resources/json/errors/whenMissingRequiredParameter.json
M
pipeline-model-definition/src/test/resources/json/errors/whenUnknownParameter.json
M pipeline-model-definition/src/test/resources/json/skippedWhen.json
A pipeline-model-definition/src/test/resources/json/whenAnd.json
M pipeline-model-definition/src/test/resources/json/whenBranchFalse.json
M pipeline-model-definition/src/test/resources/json/whenEnvFalse.json
A pipeline-model-definition/src/test/resources/json/whenNot.json
A pipeline-model-definition/src/test/resources/json/whenOr.json
M
pipeline-model-definition/src/test/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/LabelAndOtherFieldAgentScript.groovy
A pipeline-model-definition/src/test/resources/whenAnd.groovy
A pipeline-model-definition/src/test/resources/whenAndOrSingle.groovy
A pipeline-model-definition/src/test/resources/whenNestedCombinations.groovy
A pipeline-model-definition/src/test/resources/whenNot.groovy
A pipeline-model-definition/src/test/resources/whenOr.groovy
M
pipeline-model-extensions/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/DeclarativeStageConditionalDescriptor.java
Log Message:
-----------
Merge pull request #125 from abayer/jenkins-41185
[FIXED JENKINS-41185] Add support for and/not/or of when conditions
Compare:
https://github.com/jenkinsci/pipeline-model-definition-plugin/compare/f58bc2df3fb9...ff76ce7cd718
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
