Skip to content

Conversation

@ghost
Copy link

@ghost ghost commented Feb 20, 2019

Added support for system groovy script in the Jenkins xml data

Applicable Issues

Description of the Change

Alternate Designs

Benefits

Possible Drawbacks

Sign-off

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

Signed-off-by:

}

/**
* This function adds system groovy script to the XML data.
Copy link
Contributor

@erik-edling erik-edling Feb 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Write in this description that only one groovy script may be added,

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Copy link
Contributor

@erik-edling erik-edling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, got one comment about a javadoc

Copy link

@tobiasake tobiasake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have no LOGGER:s in our test framework? Would be good to have logs so it easier to debug when test fails. This a general comments for the whole Test Frameworks as well.

private static final String GROOVY_SCRIPT_SCRIPT_PLUGIN_VERSION = "2.1";
private static final String GROOVY_SCRIPT_SECURITY_PLUGIN_VERSION = "1.51";

private String hudsonPluginsGroovyGroovyKey = "hudson.plugins.groovy.Groovy plugin='groovy@%s'";

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why groovy two times in the name?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it reflects the xml node name, it has groovy 2 times.

public JenkinsXmlData addGrovyScript(String script) {
String hudsonGroovyKey = "hudson.plugins.groovy.Groovy plugin='groovy@2.1'";
boolean hasKeyGroovy = builders.has(hudsonGroovyKey);
hudsonPluginsGroovyGroovyKey = String.format(hudsonPluginsGroovyGroovyKey, GROOVY_SCRIPT_SCRIPT_PLUGIN_VERSION);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why Script two times in the name?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

*/
public JenkinsXmlData addSystemGrovyScript(String script, boolean sandbox) throws Exception {
hudsonPluginGroovySystemGroovyKey = String.format(hudsonPluginGroovySystemGroovyKey,
GROOVY_SCRIPT_SCRIPT_PLUGIN_VERSION);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@ghost ghost merged commit 189ad89 into eiffel-community:master Feb 20, 2019
erik-edling pushed a commit to erik-edling/eiffel-commons that referenced this pull request Aug 12, 2019
erik-edling pushed a commit to erik-edling/eiffel-commons that referenced this pull request Aug 12, 2019
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants