|
||||||||
|
This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira |
||||||||
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Code changed in jenkins
User: Robert Sandell
Path:
.gitignore
src/main/java/hudson/plugins/envfile/EnvFileBuildWrapper.java
src/main/java/hudson/plugins/setenv/SetEnvBuildWrapper.java
src/main/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapper.java
src/main/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationListener.java
src/test/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapperTest.java
src/test/resources/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapperTest/testSetEnvAndEnvInject.zip
http://jenkins-ci.org/commit/envinject-plugin/eac6c25d15978d4c9e9921efed8418b8ef34418e
Log:
Fix JENKINS-22169
If setenv and envinject are both configured for a job the
EnvInjectMigrationBuildWrapper will overwrite existing envinject config.
This fix introduces the migration in SetEnvBuildWrapper to the original project
so it can check if there is any existing config and transfer that over before
returning the replacement. It currently only looks at the propertiesContent
and any other config will still be overwritten.
Change-Id: Ief68f06d714f0a31f8fc8461aaa4cd893c64599b