From f21504fb759f7595beb1ca29f18b81070acc55fa Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Thu, 3 Mar 2016 19:25:47 -0500 Subject: [PATCH 1/3] set repo path with chef attribute --- omnibus-ansible-dk/.kitchen.yml | 1 + omnibus-ansible-dk/recipes/default.rb | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/omnibus-ansible-dk/.kitchen.yml b/omnibus-ansible-dk/.kitchen.yml index 43555d5..f44d395 100644 --- a/omnibus-ansible-dk/.kitchen.yml +++ b/omnibus-ansible-dk/.kitchen.yml @@ -40,3 +40,4 @@ suites: build_user_group: vagrant build_user_password: vagrant install_dir: /opt/ansible-dk + project_repo: /var/cache/omnibus-project diff --git a/omnibus-ansible-dk/recipes/default.rb b/omnibus-ansible-dk/recipes/default.rb index 8ad514c..22d8180 100644 --- a/omnibus-ansible-dk/recipes/default.rb +++ b/omnibus-ansible-dk/recipes/default.rb @@ -1,24 +1,24 @@ # Use the omnibus-build resource to build the project -directory '/var/cache/omnibus-project' do +directory node[:omnibus][:project_repo] do owner node[:omnibus][:build_user] end -git '/var/cache/omnibus-project' do +git node[:omnibus][:project_repo] do repository 'https://github.com/omniti-labs/ansible-dk.git' action :sync user node[:omnibus][:build_user] end -link '/var/cache/omnibus-project/omnibus-ansible-dk/.gitconfig' do +link "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk/.gitconfig" do to "/home/#{node[:omnibus][:build_user]}/.gitconfig" end -file '/var/cache/omnibus-project/omnibus-ansible-dk/Gemfile.lock' do +file "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk/Gemfile.lock" do action :delete end omnibus_build 'ansible-dk' do - project_dir '/var/cache/omnibus-project/omnibus-ansible-dk' + project_dir "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk" config_overrides({dummy: 'value' }) end From e35284dc89a8ebd8ecf6ef57681b261fffca07c0 Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Thu, 3 Mar 2016 20:28:33 -0500 Subject: [PATCH 2/3] no more vagrant user --- omnibus-ansible-dk/.kitchen.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/omnibus-ansible-dk/.kitchen.yml b/omnibus-ansible-dk/.kitchen.yml index f44d395..15f4bd2 100644 --- a/omnibus-ansible-dk/.kitchen.yml +++ b/omnibus-ansible-dk/.kitchen.yml @@ -36,8 +36,5 @@ suites: - ansible-dk-builder::default # Executes the build attributes: omnibus: - build_user: vagrant - build_user_group: vagrant - build_user_password: vagrant install_dir: /opt/ansible-dk project_repo: /var/cache/omnibus-project From 1fa3ee67faa8c78c757c693166d0b7aa9b0043a9 Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Fri, 4 Mar 2016 11:14:37 -0500 Subject: [PATCH 3/3] do not append timestamp to version identifier --- omnibus-ansible-dk/omnibus.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/omnibus-ansible-dk/omnibus.rb b/omnibus-ansible-dk/omnibus.rb index a7b5d24..38a40f3 100644 --- a/omnibus-ansible-dk/omnibus.rb +++ b/omnibus-ansible-dk/omnibus.rb @@ -51,3 +51,6 @@ # ------------------------------ windows_arch %w{x86 x64}.include?((ENV['OMNIBUS_WINDOWS_ARCH'] || '').downcase) ? ENV['OMNIBUS_WINDOWS_ARCH'].downcase.to_sym : :x86 + +append_timestamp false +