Merge pull request #50 from natemccurdy/show_master

config_version: Show the compiling master's name
This commit is contained in:
Gabriel M. Schuyler 2017-07-05 17:17:57 -07:00 committed by GitHub
commit ee0e87de27
3 changed files with 24 additions and 16 deletions

View File

@ -1,10 +1,18 @@
#!/usr/bin/env ruby #!/opt/puppetlabs/puppet/bin/ruby
require 'json' require 'json'
require 'socket'
environmentpath = ARGV[0] environmentpath = ARGV[0]
environment = ARGV[1] environment = ARGV[1]
# Get the hostname of the Puppet master compiling the catalog.
compiling_master = Socket.gethostname
# Get the path to the Code Manager deployment info file.
r10k_deploy_file_path = File.join(environmentpath, environment, '.r10k-deploy.json') r10k_deploy_file_path = File.join(environmentpath, environment, '.r10k-deploy.json')
#output the sha1 from the control-repo # Get the first 12 characters of the commit ID out of the deployment file.
puts JSON.parse(File.read(r10k_deploy_file_path))['signature'] commit_id = JSON.parse(File.read(r10k_deploy_file_path))['signature'][0...11]
# Show the compiling master, environment name, and commit ID.
puts "#{compiling_master}-#{environment}-#{commit_id}"

View File

@ -1,24 +1,24 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin begin
require 'rugged' require 'rugged'
require 'socket'
rescue LoadError => e rescue LoadError => e
t = Time.new t = Time.new
puts t.to_i puts t.to_i
else else
environmentpath = ARGV[0] environmentpath = ARGV[0]
environment = ARGV[1] environment = ARGV[1]
# Get the hostname of the Puppet master compiling the catalog.
compiling_master = Socket.gethostname
# Get the path to the environment being compiled.
repo = Rugged::Repository.discover(File.join(environmentpath, environment)) repo = Rugged::Repository.discover(File.join(environmentpath, environment))
head = repo.head head = repo.head
#sha1 hash of the newest commit # First 12 characters of the sha1 hash of the newest commit.
head_sha = head.target_id commit_id = head.target_id[0...11]
#the commit message associated the newest commit # Show the compiling master, environment name, and commit ID.
commit = repo.lookup(head_sha) puts "#{compiling_master}-#{environment}-#{commit_id}"
#add something to find the remote url
puts head_sha
end end

View File

@ -3,10 +3,10 @@ if [ -e $1/$2/.r10k-deploy.json ]
then then
/opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/code_manager_config_version.rb $1 $2 /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/code_manager_config_version.rb $1 $2
elif [ -e /opt/puppetlabs/server/pe_version ] elif [ -e /opt/puppetlabs/server/pe_version ]
then then
/opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2
else else
/usr/bin/git --version > /dev/null 2>&1 && /usr/bin/git --version > /dev/null 2>&1 &&
/usr/bin/git --git-dir $1/$2/.git rev-parse HEAD || /usr/bin/git --git-dir $1/$2/.git rev-parse HEAD ||
date +%s date +%s
fi fi