| Code changed in jenkins User: Andrew Bayer Path: pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/BranchConditional.java pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/EnvironmentConditional.java pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/BranchConditionalScript.groovy pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/EnvironmentConditionalScript.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/whenBranch.json pipeline-model-definition/src/test/resources/json/whenBranchFalse.json pipeline-model-definition/src/test/resources/json/whenEnv.json pipeline-model-definition/src/test/resources/json/whenEnvFalse.json pipeline-model-definition/src/test/resources/whenBranch.groovy pipeline-model-definition/src/test/resources/whenBranchFalse.groovy pipeline-model-definition/src/test/resources/whenBranchTrue.groovy pipeline-model-definition/src/test/resources/whenEnv.groovy pipeline-model-definition/src/test/resources/whenEnvFalse.groovy pipeline-model-definition/src/test/resources/whenEnvTrue.groovy http://jenkins-ci.org/commit/pipeline-model-definition-plugin/4af77f00e32e2e6c459c15564ca84b4c53a6332c Log: [FIXED JENKINS-41012] Actually get when branch/env to work Stop relying on the step context, since that wasn't actually getting provided, and instead pass in the needed arguments from the *Script class. Also make sure we actually have tests for all the conditions passing, not just failing. Oy, but I feel silly there. |