(FM-6170) Addition of branch check for build number creation

puppetlabs · May 8, 2017 · c151dd2 · c151dd2
1 parent 81803aa
commit c151dd2
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/puppetlabs_spec_helper/rake_tasks.rb b/lib/puppetlabs_spec_helper/rake_tasks.rb
@@ -500,13 +500,18 @@ def max_thread_limit
   end
 
   sha = `git rev-parse HEAD`[0..7]
+  branch = `git branch`
 
   # If we're in a CI environment include our build number
   if build = ENV['BUILD_NUMBER'] || ENV['TRAVIS_BUILD_NUMBER']
-    new_version = sprintf('%s-%04d-%s', version, build, sha)
+    if branch.include? "* release"
+		  new_version = sprintf('%s-%s%04d-%s', version, "r", build, sha)
+    else 
+      new_version = sprintf('%s-%04d-%s', version, build, sha)
+    end
   else
     new_version = "#{version}-#{sha}"
-  end
+	end
 
   print new_version
 end