Skip to content

Commit

Permalink
[puppetlabs#1058] Add acceptance test for repeated git remote
Browse files Browse the repository at this point in the history
This commit adds a beaker acceptance test verifying that it is possible
to use the same remote for several non-module objects. This case
previously broke when the `pool_size` feature was introduced, because
there was a race condition when creating the git cache in shellgit mode,
when the same remote was used in two objects being set up concurrently.
  • Loading branch information
Magisus committed Jul 28, 2020
1 parent 15f9a6f commit eb9e026
Showing 1 changed file with 68 additions and 0 deletions.
68 changes: 68 additions & 0 deletions integration/tests/git_source/git_source_repeated_remote.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
require 'git_utils'
require 'r10k_utils'
require 'master_manipulator'
test_name 'Verify the same remote can be used in more than one object'

env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
r10k_fqp = get_r10k_fqp(master)
git_environments_path = '/root/environments'
git_repo_path = '/git_repos'
git_repo_name = 'environments'
git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
code_dir = '/etc/puppetlabs/code/environments/production'

last_commit = git_last_commit(master, git_environments_path)
git_provider = ENV['GIT_PROVIDER']
r10k_config_path = get_r10k_config_file_path(master)
r10k_config_bak_path = "#{r10k_config_path}.bak"
#In-line files
r10k_conf = <<-CONF
cachedir: '/var/cache/r10k'
git:
provider: '#{git_provider}'
sources:
control:
basedir: "#{env_path}"
remote: "#{git_control_remote}"
CONF

# Install the same module in two different places
puppetfile = <<-EOS
mod 'prod_apache',
:git => 'git://github.com/puppetlabs/puppetlabs-apache.git',
:branch => 'master'
mod 'test_apache',
:git => 'git://github.com/puppetlabs/puppetlabs-apache.git',
:branch => 'master'
EOS

teardown do
step 'Restore Original "r10k" Config'
on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")

clean_up_r10k(master, last_commit, git_environments_path)
end

step 'Stub the forge'
stub_forge_on(master)

step 'Backup Current "r10k" Config'
on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")

step 'Update the "r10k" Config'
create_remote_file(master, r10k_config_path, r10k_conf)

step 'Ask r10k to deploy'
on(master, "#{r10k_fqp} deploy environment -p")

step 'Add puppetfile with repeated remote'
create_remote_file(master, "#{git_environments_path}/Puppetfile", puppetfile)
git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)

step 'Deploy r10k'
on(master, "#{r10k_fqp} deploy environment -p")

step 'Verify module was installed in both places'
on(master, "test -d #{code_dir}/modules/prod_apache")
on(master, "test -d #{code_dir}/modules/test_apache")

0 comments on commit eb9e026

Please sign in to comment.