forked from redhat-openstack/openstack-puppet-modules
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update vcsrepo to dd4b638a420c75eb3a3a2badceffc720be231096
dd4b638a420c75eb3a3a2badceffc720be231096 Merge pull request redhat-openstack#263 from mhaskel/MODULES-2326 f385df10c57a0a09fa316004e6af18acd56df710 MODULES-2326 - Run Regexp.escape on the source URL d7534d7cfe98d62b8f0d9ae8adcc30bea483a1e2 Merge pull request redhat-openstack#261 from mhaskel/MODULES-2125 14c05f5d6c589bebc9f93eb117105c14ce7be6f1 MODULES-2125 - Allow revision to be passed without source 5ef1b4740e1aab6672ee3971762c796c898ca639 Merge pull request redhat-openstack#260 from mhaskel/MODULES-1800 d68402d1f930d5a30f1ec9224ac3791b6d9d29b9 MODULES-1800 - fix case where ensure => latest and no revision specified 266b20510b9eec7e8e91096f5aa370ae52a136e7 Merge pull request redhat-openstack#259 from mhaskel/merge_1.3.x_to_master 56d55ee4426ddcbcf568d5b413ed780812738657 Merge pull request redhat-openstack#258 from mhaskel/1.3.1-prep 03ceba70e71e32a4ed56a06c716d91f7db2783f9 1.3.1 prep 231f711e3f0ccb8601bea55f0e6d562b8674488e Merge pull request redhat-openstack#256 from keeleysam/master b3cddcbd57639acbf0c4a7fa671a70f787e010da fix for detached HEAD on git 2.4+ 3a437ea1bc4eafb64621911c34e9821f1e10241b Merge pull request redhat-openstack#242 from BillWeiss/bump-ssl-expiry 1be44c3b95b8e01ac583661c5f9465c141cf82da Just bumping the expiration date... Change-Id: Ica9906d21ddd26f90fe513b158360bde8ba9018b
- Loading branch information
Showing
9 changed files
with
186 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
-----BEGIN CERTIFICATE----- | ||
MIICATCCAWoCCQCS3fQotV10LzANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB | ||
VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 | ||
cyBQdHkgTHRkMB4XDTE0MDQyMzIyMzEyM1oXDTE1MDQyMzIyMzEyM1owRTELMAkG | ||
A1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0 | ||
MIICATCCAWoCCQDRobnOvvkStDANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB | ||
VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0 | ||
cyBQdHkgTHRkMB4XDTE1MDQwODE3MjM1NVoXDTI1MDQwNTE3MjM1NVowRTELMAkG | ||
A1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0 | ||
IFdpZGdpdHMgUHR5IEx0ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyRTv | ||
uX6328aQ5Auc8PI+xNaCiE0UZNYcs+xq3AEkR/Tnz0HGXdx3+PnFG7MIRSS65hXA | ||
VGenZk3wP4vNIe9gu+G9jtOFTJOgoOBUnJ/Hcs79Zgcmz3cAWQpqww+CZpyngUDS | ||
msZ5HoEbNS+qaIron3IrYCgPsy1BHFs5ze7JrtcCAwEAATANBgkqhkiG9w0BAQUF | ||
AAOBgQA2uLvdc1cf+nt7d8Lmu0SdaoIsCzh6DjVscCpFJKXdDjGT2Ys40iKbLRnY | ||
Tt98wa6uRzEhSKfx+zVi8n3PSkQHlER7jzKFXMVx8NEt2/O/APKXVizmLFjk5WcT | ||
FvGmmbkqX+Nj9TUTuSRZEmF776r5k8U5ABu/VarxvAzyoXAhqA== | ||
AAOBgQCaYVv8WbFbrnLMOcyjE7GjSmVh68fEN+AqntZa1Z5GOv6OQIN9mVSoNxWo | ||
lb/9xmldfMQThgKckHHvB5Q9kf923nMQZOi8yxyaoeYWrkglkFFU/sdF6yuFBdUU | ||
D+rXmHnS754FLTGDzESmlRVUCYuwVgrRdm+P+wu2+lZT3x85VA== | ||
-----END CERTIFICATE----- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
require 'spec_helper_acceptance' | ||
|
||
tmpdir = default.tmpdir('vcsrepo') | ||
|
||
describe 'clones a remote repo' do | ||
before(:all) do | ||
my_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) | ||
shell("mkdir -p #{tmpdir}") # win test | ||
end | ||
|
||
after(:all) do | ||
shell("rm -rf #{tmpdir}/vcsrepo") | ||
end | ||
|
||
context 'ensure latest with no revision' do | ||
it 'clones from default remote' do | ||
pp = <<-EOS | ||
vcsrepo { "#{tmpdir}/vcsrepo": | ||
ensure => present, | ||
provider => git, | ||
source => "https://github.com/puppetlabs/puppetlabs-vcsrepo.git", | ||
} | ||
EOS | ||
|
||
apply_manifest(pp, :catch_failures => true) | ||
shell("cd #{tmpdir}/vcsrepo; /usr/bin/git reset --hard HEAD~2") | ||
end | ||
|
||
it 'updates' do | ||
pp = <<-EOS | ||
vcsrepo { "#{tmpdir}/vcsrepo": | ||
ensure => latest, | ||
provider => git, | ||
source => "https://github.com/puppetlabs/puppetlabs-vcsrepo.git", | ||
} | ||
EOS | ||
|
||
apply_manifest(pp, :catch_failures => true) | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
require 'spec_helper_acceptance' | ||
|
||
tmpdir = default.tmpdir('vcsrepo') | ||
|
||
describe 'clones with special characters' do | ||
|
||
before(:all) do | ||
my_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) | ||
shell("mkdir -p #{tmpdir}") # win test | ||
scp_to(default, "#{my_root}/acceptance/files/create_git_repo.sh", tmpdir) | ||
shell("cd #{tmpdir} && ./create_git_repo.sh") | ||
end | ||
|
||
after(:all) do | ||
shell("rm -rf #{tmpdir}/testrepo.git") | ||
end | ||
|
||
context 'as a user with ssh' do | ||
before(:all) do | ||
# create user | ||
pp = <<-EOS | ||
group { 'testuser-ssh': | ||
ensure => present, | ||
} | ||
user { 'testuser-ssh': | ||
ensure => present, | ||
groups => 'testuser-ssh', | ||
managehome => true, | ||
} | ||
EOS | ||
apply_manifest(pp, :catch_failures => true) | ||
|
||
# create ssh keys | ||
shell('mkdir -p /home/testuser-ssh/.ssh') | ||
shell('ssh-keygen -q -t rsa -f /home/testuser-ssh/.ssh/id_rsa -N ""') | ||
|
||
# copy public key to authorized_keys | ||
shell('cat /home/testuser-ssh/.ssh/id_rsa.pub > /home/testuser-ssh/.ssh/authorized_keys') | ||
shell('echo -e "Host localhost\n\tStrictHostKeyChecking no\n" > /home/testuser-ssh/.ssh/config') | ||
shell('chown -R testuser-ssh:testuser-ssh /home/testuser-ssh/.ssh') | ||
shell("chown testuser-ssh:testuser-ssh #{tmpdir}") | ||
end | ||
|
||
it 'applies the manifest' do | ||
pp = <<-EOS | ||
vcsrepo { "#{tmpdir}/testrepo_user_ssh": | ||
ensure => present, | ||
provider => git, | ||
source => "git+ssh://testuser-ssh@localhost#{tmpdir}/testrepo.git", | ||
user => 'testuser-ssh', | ||
} | ||
EOS | ||
|
||
# Run it twice and test for idempotency | ||
apply_manifest(pp, :catch_failures => true) | ||
apply_manifest(pp, :catch_changes => true) | ||
end | ||
|
||
after(:all) do | ||
pp = <<-EOS | ||
user { 'testuser-ssh': | ||
ensure => absent, | ||
managehome => true, | ||
} | ||
EOS | ||
apply_manifest(pp, :catch_failures => true) | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters