[JIRA] (JENKINS-40462) Wrappers in options

Issue Type:	Task
Assignee:	Andrew Bayer
Components:	pipeline-model-definition-plugin
Created:	2016/Dec/14 11:27 PM
Priority:	Minor
Reporter:	James Dumay

We don't want to have

 
                                                                pipeline {
    agent none
    wrappers {
        timeout(time: 5, unit: 'MINUTES')
        colorize()
    }
    stages {
        stage("foo") {
            steps {
                echo "hello"
            }
        }
    }
}
 
                                                            

To:

 
                                                                pipeline {
    agent none
    options {
      timeout(time: 5, unit: 'MINUTES')
      colorize()
    }
    stages {
        stage("foo") {
            steps {
                echo "hello"
            }
        }
    }
}
 
                                                            

This message was sent by Atlassian JIRA (v7.1.7#71011-sha1:2526d7c)

jdumay@cloudbees.com (JIRA)

unread,

Dec 14, 2016, 6:29:01 PM12/14/16

to jenkinsc...@googlegroups.com

James Dumay updated an issue

Jenkins /

Change By:	James Dumay

We don't want to have

change wrappers from:
{code}

pipeline {
    agent none
    wrappers {
        timeout(time: 5, unit: 'MINUTES')
        colorize()
    }
    stages {
        stage("foo") {
            steps {
                echo "hello"
            }
        }
    }
}

{code}

To look like this :
{code}

pipeline {
    agent none
    options {
      timeout(time: 5, unit: 'MINUTES')
      colorize()
    }
    stages {
        stage("foo") {
            steps {
                echo "hello"
            }
        }
    }
}

{code}

andrew.bayer@gmail.com (JIRA)

unread,

Dec 16, 2016, 6:44:01 PM12/16/16

to jenkinsc...@googlegroups.com

Andrew Bayer started work on

Change By:	Andrew Bayer
Status:	Open In Progress

andrew.bayer@gmail.com (JIRA)

unread,

Dec 16, 2016, 7:14:02 PM12/16/16

to jenkinsc...@googlegroups.com

Andrew Bayer commented on

PR up at https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/72, building on https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/70

andrew.bayer@gmail.com (JIRA)

unread,

Dec 16, 2016, 7:14:02 PM12/16/16

to jenkinsc...@googlegroups.com

Andrew Bayer updated

Jenkins /

Change By:	Andrew Bayer
Status:	In Progress Review

rsandell@cloudbees.com (JIRA)

unread,

Dec 19, 2016, 6:07:01 AM12/19/16

to jenkinsc...@googlegroups.com

rsandell commented on

So what is the motivation behind this change?
Some build wrappers actually do stuff and would perhaps seem awkward to put into an options section, like xvfb and JiraReleaseNotes for example.

andrew.bayer@gmail.com (JIRA)

unread,

Dec 19, 2016, 8:31:01 AM12/19/16

to jenkinsc...@googlegroups.com

Andrew Bayer commented on

I'll let James Dumay speak to that. =) But fwiw, xvfb, for example, isn't a valid candidate for wrappers already, since it requires a node context.

jdumay@cloudbees.com (JIRA)

unread,

Dec 19, 2016, 11:06:02 PM12/19/16

to jenkinsc...@googlegroups.com

James Dumay commented on

rsandell https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/67#issuecomment-266619706

andrew.bayer@gmail.com (JIRA)

unread,

Jan 5, 2017, 1:58:02 PM1/5/17

to jenkinsc...@googlegroups.com

Andrew Bayer updated

Jenkins /

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

scm_issue_link@java.net (JIRA)

unread,

Jan 5, 2017, 1:58:02 PM1/5/17

to jenkinsc...@googlegroups.com

SCM/JIRA link daemon commented on

Code changed in jenkins
User: Andrew Bayer
Path:
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTPipelineDef.java
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrapper.java
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrappers.java
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
pipeline-model-api/src/main/resources/ast-schema.json
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Options.groovy
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Root.groovy
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Wrappers.groovy
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/WrappersToMap.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/ClosureModelTranslator.groovy
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTranslator.groovy
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersToMapTranslator.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/OptionsTest.java
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersTest.java
pipeline-model-definition/src/test/resources/errors/invalidWrapperType.groovy
pipeline-model-definition/src/test/resources/json/errors/invalidWrapperType.json
pipeline-model-definition/src/test/resources/json/multipleWrappers.json
pipeline-model-definition/src/test/resources/json/simpleWrapper.json
pipeline-model-definition/src/test/resources/multipleProperties.groovy
pipeline-model-definition/src/test/resources/multipleWrappers.groovy
pipeline-model-definition/src/test/resources/simpleWrapper.groovy
http://jenkins-ci.org/commit/pipeline-model-definition-plugin/0bc6a85050c48bf43ca3d4ef05d8ab9da3a81c3e
Log:
[FIXED JENKINS-40462] Move wrappers into options

This depends on
https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/70
so shouldn't be merged until that's in.

I'm not a huge fan of the hoops we have to jump through to support
wrappers in the same section as Describables, so I may tweak this.

scm_issue_link@java.net (JIRA)

unread,

Jan 5, 2017, 2:10:02 PM1/5/17

to jenkinsc...@googlegroups.com

SCM/JIRA link daemon commented on