Commit fa79af6a authored by Ken Barber's avatar Ken Barber

PDB-554 Switch to using new experimental ec2 beaker driver

This patch modifies our Gemfile and acceptance configuration so that we are
using my experimental EC2 backend driver from beaker.

At the moment its just pointing at my branch, so we can continue to test this
with our real Jenkins runs before releasing it to beaker proper.
Signed-off-by: 's avatarKen Barber <ken@bob.sh>
parent 728f5e43
......@@ -23,5 +23,7 @@ group :test do
end
group :acceptance do
gem 'beaker', '~> 1.7'
# gem 'beaker', '~> 1.7'
# Temp branch with new ec2 backend
gem 'beaker', :git => 'git://github.com/kbarber/beaker.git', :branch => 'ticket/master/pdb-554'
end
......@@ -8,7 +8,7 @@ HOSTS:
vmname: debian6-amd64-west
platform: debian-6-amd64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
debian6-64-2:
roles:
......@@ -16,7 +16,7 @@ HOSTS:
vmname: debian6-amd64-west
platform: debian-6-amd64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
CONFIG:
nfs_server: none
......
......@@ -8,7 +8,7 @@ HOSTS:
vmname: el-5-x86_64-west
platform: el-5-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
el5-64-2:
roles:
......@@ -16,7 +16,7 @@ HOSTS:
vmname: el-5-x86_64-west
platform: el-5-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
CONFIG:
nfs_server: none
......
......@@ -8,7 +8,7 @@ HOSTS:
vmname: el-6-x86_64-west
platform: el-6-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
el5-64-1:
roles:
......@@ -16,7 +16,7 @@ HOSTS:
vmname: el-5-x86_64-west
platform: el-5-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
ubuntu-12.04-64-1:
roles:
......@@ -24,7 +24,7 @@ HOSTS:
vmname: ubuntu-12.04-amd64-west
platform: ubuntu-12.04-amd64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
CONFIG:
nfs_server: none
......
......@@ -8,7 +8,7 @@ HOSTS:
vmname: el-6-x86_64-west
platform: el-6-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
el6-64-2:
roles:
......@@ -16,7 +16,7 @@ HOSTS:
vmname: el-6-x86_64-west
platform: el-6-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
CONFIG:
nfs_server: none
......
......@@ -8,7 +8,7 @@ HOSTS:
vmname: el-6-x86_64-west
platform: el-6-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
CONFIG:
......
......@@ -8,7 +8,7 @@ HOSTS:
vmname: fedora-20-x86_64-west
platform: fedora-20-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
fedora-20-2:
roles:
......@@ -16,7 +16,7 @@ HOSTS:
vmname: fedora-20-x86_64-west
platform: fedora-20-x86_64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
CONFIG:
......
......@@ -8,7 +8,7 @@ HOSTS:
vmname: ubuntu-10.04-amd64-west
platform: ubuntu-10.04-amd64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
ubuntu-1004-64-2:
roles:
......@@ -16,7 +16,7 @@ HOSTS:
vmname: ubuntu-10.04-amd64-west
platform: ubuntu-10.04-amd64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
CONFIG:
nfs_server: none
......
......@@ -8,7 +8,7 @@ HOSTS:
vmname: ubuntu-12.04-amd64-west
platform: ubuntu-12.04-amd64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
ubuntu-1204-64-2:
roles:
......@@ -16,7 +16,7 @@ HOSTS:
vmname: ubuntu-12.04-amd64-west
platform: ubuntu-12.04-amd64
amisize: c1.medium
hypervisor: blimpy
hypervisor: ec2
snapshot: foss
CONFIG:
nfs_server: none
......
......@@ -880,7 +880,7 @@ module PuppetDBExtensions
repositories.each do |repository|
step "Install #{repository[:name]}"
install_from_git host, source_path, repository,
:refspec => '+refs/pull/*:refs/remotes/origin/pr/*'
:refspec => '+refs/heads/*:refs/remotes/origin/*'
end
on host, "getent group puppet || groupadd puppet"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment