Merge pull request #37 from cchong/master

[FIXED JENKINS-16063] Added PROMOTED_USER_NAME environment variable
jenkinsci · Mar 5, 2014 · eeb9e65 · eeb9e65
2 parents fd95bf4 + 5f8e473
commit eeb9e65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/promoted_builds/Promotion.java b/src/main/java/hudson/plugins/promoted_builds/Promotion.java
@@ -100,7 +100,8 @@ public EnvVars getEnvironment(TaskListener listener) throws IOException, Interru
         e.put("PROMOTED_JOB_FULL_NAME", target.getParent().getFullName());
         e.put("PROMOTED_NUMBER", Integer.toString(target.getNumber()));
         e.put("PROMOTED_ID", target.getId());
-        EnvVars envScm = new EnvVars();
+        e.put("PROMOTED_USER_NAME", getUserName());
+	 EnvVars envScm = new EnvVars();
         target.getProject().getScm().buildEnvVars( target, envScm );
         for ( Entry<String, String> entry : envScm.entrySet() )
         {

diff --git a/src/test/java/hudson/plugins/promoted_builds/PromotionEnvironmentVariablesTest.java b/src/test/java/hudson/plugins/promoted_builds/PromotionEnvironmentVariablesTest.java
@@ -63,7 +63,8 @@ public void shouldSetJobAndJobFullNames() throws Descriptor.FormException, IOExc
         // Assert
         assertEquals("Folder/Project", env.get("PROMOTED_JOB_FULL_NAME"));
         assertEquals("Project", env.get("PROMOTED_JOB_NAME"));
-
+	assertEquals("SYSTEM", env.get("PROMOTED_USER_NAME"));       
+
         project.delete();
         parent.delete();
     }