mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-11 02:56:21 +00:00
[FIXED JENKINS-15918] follow-up changes
- Environment variables are by convention upper case, so I'm switching to upper case. This was what the original ticket requested anyway. - Since the ".jobName" was never documented to begin with, let's not promote that and stick to "_JOBNAME" as the official version.
This commit is contained in:
1 parent
ebcf61ef35
commit
5e4b7bcc36
3 files changed
+13
-17
No files matched your search
@@ -72,11 +72,11 @@ public class RunParameterValue extends ParameterValue {
|
||||
String value = Jenkins.getInstance().getRootUrl() + getRun().getUrl();
|
||||
env.put(name, value);
|
||||
|
||||
env.put(name + ".jobName", getJobName());
|
||||
env.put(name + "_jobName", getJobName());
|
||||
env.put(name + ".jobName", getJobName()); // undocumented, left for backward compatibility
|
||||
env.put(name + "_JOBNAME", getJobName()); // prefer this version
|
||||
|
||||
env.put(name + ".number" , getNumber ());
|
||||
env.put(name + "_number" , getNumber ());
|
||||
env.put(name + ".number" , getNumber ()); // same as above
|
||||
env.put(name + "_NUMBER" , getNumber ());
|
||||
|
||||
env.put(name.toUpperCase(Locale.ENGLISH),value); // backward compatibility pre 1.345
|
||||
|
||||
|
||||
@@ -60,9 +60,9 @@ public class RunParameterDefinitionTest {
|
||||
val.buildEnvVars(null, env);
|
||||
assertEquals(j.jenkins.getRootUrl() + "job/dir/job/sub%20dir/job/some%20project/2/", env.get("build"));
|
||||
assertEquals("dir/sub dir/some project", env.get("build.jobName"));
|
||||
assertEquals("dir/sub dir/some project", env.get("build_jobName"));
|
||||
assertEquals("dir/sub dir/some project", env.get("build_JOBNAME"));
|
||||
assertEquals("2", env.get("build.number"));
|
||||
assertEquals("2", env.get("build_number"));
|
||||
assertEquals("2", env.get("build_NUMBER"));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,13 +1,9 @@
|
||||
<div>
|
||||
Defines the job from which the user can pick runs. The last run will be the default.<br/>
|
||||
<br/>
|
||||
These parameters are exposed to build as environment variables:<br/>
|
||||
<br/>
|
||||
PARAMETER_NAME=<jenkins_url>/job/<job_name>/<run_number/<br/>
|
||||
<br/>
|
||||
PARAMETER_NAME.jobName=<job_name><br/>
|
||||
PARAMETER_NAME_jobName=<job_name><br/>
|
||||
<br/>
|
||||
PARAMETER_NAME.number=<run_number><br/>
|
||||
PARAMETER_NAME_number=<run_number>
|
||||
Defines the job from which the user can pick runs. The last run will be the default.
|
||||
These parameters are exposed to build as environment variables:
|
||||
<pre>
|
||||
PARAMETER_NAME=<i><jenkins_url></i>/job/<i><job_name>/<run_number></i>/
|
||||
PARAMETER_NAME_JOBNAME=<i><job_name></i>
|
||||
PARAMETER_NAME_NUMBER=<i><run_number></i>
|
||||
</pre>
|
||||
</div>
|
||||
Reference in new issue
Block a user