[JIRA] (JENKINS-42762) Regression: Multiple when conditions no longer work

[andrew.bayer@gmail.com (JIRA)]

Andrew Bayer started work on JENKINS-42762

Change By: Andrew Bayer Status: Open In Progress Add Comment

This message was sent by Atlassian JIRA (v7.3.0#73011-sha1:3c73d0e)

[andrew.bayer@gmail.com (JIRA)]

Andrew Bayer created an issue

Jenkins / JENKINS-42762 Regression: Multiple when conditions no longer work Issue Type: Bug Assignee: Andrew Bayer Components: pipeline-model-definition-plugin Created: 2017/Mar/14 4:39 PM Environment: Declarative 1.0/1.1.1 Priority: Critical Reporter: Andrew Bayer So I borked this - I mistakenly thought we already had logic that prevented you from actually having multiple when conditions, but I was wrong. So now I'm going to reenable it, and it'll work basically like if the multiple when conditions were wrapped in an allOf condition, replicating previous behavior.

Add Comment

[andrew.bayer@gmail.com (JIRA)]

Andrew Bayer commented on JENKINS-42762

Re: Regression: Multiple when conditions no longer work PR up at https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/138

Add Comment

[andrew.bayer@gmail.com (JIRA)]

Andrew Bayer updated JENKINS-42762

Jenkins / JENKINS-42762

Regression: Multiple when conditions no longer work

Change By: Andrew Bayer Status: In Progress Review

Add Comment

[scm_issue_link@java.net (JIRA)]

SCM/JIRA link daemon commented on JENKINS-42762

Re: Regression: Multiple when conditions no longer work Code changed in jenkins User: Andrew Bayer Path: pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java pipeline-model-api/src/main/resources/ast-schema.json pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/StageConditionals.groovy pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java pipeline-model-definition/src/test/resources/whenMultiple.groovy http://jenkins-ci.org/commit/pipeline-model-definition-plugin/3bc41e062a1edbf8d2a0323bc05c38d4d96dba67 Log: [FIXED JENKINS-42762] Allow multiple conditions in when directly Reverts changes made in JENKINS-41185 fix. Does not affect the core of the changes in JENKINS-41185.

Add Comment

[scm_issue_link@java.net (JIRA)]

SCM/JIRA link daemon commented on JENKINS-42762

Re: Regression: Multiple when conditions no longer work

Code changed in jenkins User: Andrew Bayer Path: pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWhen.java pipeline-model-api/src/main/resources/ast-schema.json pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/StageConditionals.groovy pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy

pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java pipeline-model-definition/src/test/resources/json/basicWhen.json pipeline-model-definition/src/test/resources/json/errors/emptyWhen.json pipeline-model-definition/src/test/resources/json/errors/unknownWhenConditional.json pipeline-model-definition/src/test/resources/json/errors/whenInvalidParameterType.json pipeline-model-definition/src/test/resources/json/errors/whenMissingRequiredParameter.json pipeline-model-definition/src/test/resources/json/errors/whenUnknownParameter.json pipeline-model-definition/src/test/resources/json/skippedWhen.json pipeline-model-definition/src/test/resources/json/whenAnd.json pipeline-model-definition/src/test/resources/json/whenBranchFalse.json pipeline-model-definition/src/test/resources/json/whenEnvFalse.json pipeline-model-definition/src/test/resources/json/whenNot.json pipeline-model-definition/src/test/resources/json/whenOr.json pipeline-model-definition/src/test/resources/whenMultiple.groovy http://jenkins-ci.org/commit/pipeline-model-definition-plugin/2b88323cb2f73c194aba5abd0a99d6136c7f7f49 Log: Merge pull request #138 from abayer/jenkins-42762

[FIXED JENKINS-42762] Allow multiple conditions in when directly

Compare: https://github.com/jenkinsci/pipeline-model-definition-plugin/compare/6ead78cbcdca...2b88323cb2f7

Add Comment

[andrew.bayer@gmail.com (JIRA)]

Andrew Bayer updated JENKINS-42762

Jenkins / JENKINS-42762

Regression: Multiple when conditions no longer work

Change By: Andrew Bayer Status: In Review Resolved Resolution: Fixed

Add Comment

[bitwiseman@gmail.com (JIRA)]

Liam Newman closed an issue as Fixed

Bulk closing resolved issues.

Jenkins / JENKINS-42762 Regression: Multiple when conditions no longer work

Change By: Liam Newman Status: Resolved Closed

Add Comment

This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f)