From 4bab3630efcc2fa331db2989e321d9af1b8cdc1c Mon Sep 17 00:00:00 2001 From: Felix Belzunce Arcos Date: Thu, 12 May 2016 16:33:02 +0200 Subject: [PATCH] [FIXED JENKINS-25164] Add JOB_BASE_NAME env var (#2321) * [JENKINS-25164] Add SHORT_JOB_NAME env var * Delete strip off * [JENKINS-25164] Change SHORT_JOB_NAME for LEAF_JOB_NAME * [JENKINS-25164] Change LEAF_JOB_NAME for JOB_BASE_NAME --- core/src/main/java/hudson/model/Job.java | 1 + .../jenkins/model/CoreEnvironmentContributor/buildEnv.groovy | 2 +- .../model/CoreEnvironmentContributor/buildEnv.properties | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 263787ffcb..69cc02708e 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -369,6 +369,7 @@ public abstract class Job, RunT extends Run +["BUILD_NUMBER","BUILD_ID","BUILD_DISPLAY_NAME","JOB_NAME", "JOB_BASE_NAME","BUILD_TAG","EXECUTOR_NUMBER","NODE_NAME","NODE_LABELS","WORKSPACE","JENKINS_HOME","JENKINS_URL","BUILD_URL","JOB_URL"].each { name -> l.buildEnvVar(name:name) { raw(_("${name}.blurb")) } diff --git a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties index b1c4d4d8e1..8eed43cf12 100644 --- a/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties +++ b/core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties @@ -1,7 +1,8 @@ BUILD_NUMBER.blurb=The current build number, such as "153" BUILD_ID.blurb=The current build ID, identical to BUILD_NUMBER for builds created in 1.597+, but a YYYY-MM-DD_hh-mm-ss timestamp for older builds BUILD_DISPLAY_NAME.blurb=The display name of the current build, which is something like "#153" by default. -JOB_NAME.blurb=Name of the project of this build, such as "foo" or "foo/bar". (To strip off folder paths from a Bourne shell script, try: $'{'JOB_NAME##*/}) +JOB_NAME.blurb=Name of the project of this build, such as "foo" or "foo/bar". +JOB_BASE_NAME.blurb=Short Name of the project of this build stripping off folder paths, such as "foo" for "bar/foo". BUILD_TAG.blurb=String of "jenkins-$'{'JOB_NAME}-$'{'BUILD_NUMBER}". Convenient to put into a resource file, a jar file, etc for easier identification. EXECUTOR_NUMBER.blurb=\ The unique number that identifies the current executor \