opendev
/
puppet-gerrit
Code Issues Proposed changes

Merge "Use working war in testing"

This commit is contained in:
Jenkins 2016-05-03 12:25:51 +00:00 committed by Gerrit Code Review
parent ba011b19a7 586ad6859e
commit c785f75dda
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/acceptance/basic_spec.rb
View File

@ -121,7 +121,7 @@ describe 'basic gerrit', :if => ['debian', 'ubuntu'].include?(os[:family]) do
describe command("curl http://localhost --insecure --location") do
its(:stdout) { should contain('Gerrit Code Review') }
its(:stdout) { should contain('version":"2.8.4-19-g4548330') }
its(:stdout) { should contain('"version":"2.11.4-13-gcb9800e"') }
end
describe port(443) do
@ -130,7 +130,7 @@ describe 'basic gerrit', :if => ['debian', 'ubuntu'].include?(os[:family]) do
describe command("curl https://localhost --insecure --location") do
its(:stdout) { should contain('Gerrit Code Review') }
its(:stdout) { should contain('version":"2.8.4-19-g4548330') }
its(:stdout) { should contain('"version":"2.11.4-13-gcb9800e"') }
end
describe port(8081) do

2
spec/acceptance/fixtures/default.pp
View File

@ -23,7 +23,7 @@ class { '::gerrit::mysql':
class { '::gerrit':
mysql_host => 'localhost',
mysql_password => '12345',
war => 'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.8.4.19.4548330.war',
war => 'http://tarballs.openstack.org/ci/test/gerrit-v2.11.4.13.cb9800e.war',
ssh_rsa_key_contents => file('/tmp/gerrit-ssh-keys/ssh_rsa_key'),
ssh_rsa_pubkey_contents => file('/tmp/gerrit-ssh-keys/ssh_rsa_key.pub'),
ssh_project_rsa_key_contents => file('/tmp/gerrit-ssh-keys/ssh_project_rsa_key'),