Skip to content

Commit b2f363a

Browse files
author
Gavin Williams
authored
Merge pull request #1075 from fatmcgav/bump_beaker_version
Bump Beaker versions to support latest OS'
2 parents ecd4d77 + 7de3ee6 commit b2f363a

20 files changed

+152
-106
lines changed

‎.fixtures.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fixtures:
1111
ref: 4.13.1
1212
java:
1313
repo: puppetlabs/java
14-
ref: 2.0.0
14+
ref: 6.2.0
1515
concat:
1616
repo: puppetlabs/concat
1717
ref: 2.2.1
@@ -20,7 +20,7 @@ fixtures:
2020
ref: 0.6.2
2121
apt:
2222
repo: puppetlabs/apt
23-
ref: 2.2.2
23+
ref: 7.4.1
2424
zypprepo:
2525
repo: puppet/zypprepo
2626
ref: 2.2.2

‎.travis.yml‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,41 +50,77 @@ jobs:
5050
- PUPPET_VERSION='~> 5.0'
5151
- stage: acceptance
5252
env:
53+
- BEAKER_PUPPET_COLLECTION=puppet6
5354
- TASK=beaker:centos-6-x64:acceptance
5455
- env:
55-
- TASK=beaker:centos-6-x64:acceptance[5.6.9]
56+
- BEAKER_PUPPET_COLLECTION=puppet6
57+
- TASK=beaker:centos-6-x64:acceptance[5.6.16]
5658
- env:
59+
- BEAKER_PUPPET_COLLECTION=puppet6
5760
- TASK=beaker:centos-7-x64:acceptance
5861
- env:
59-
- TASK=beaker:centos-7-x64:acceptance[5.6.9]
62+
- BEAKER_PUPPET_COLLECTION=puppet6
63+
- TASK=beaker:centos-7-x64:acceptance[5.6.16]
6064
- env:
65+
- BEAKER_PUPPET_COLLECTION=puppet6
66+
- TASK=beaker:centos-8-x64:acceptance
67+
- env:
68+
- BEAKER_PUPPET_COLLECTION=puppet6
69+
- TASK=beaker:centos-8-x64:acceptance[5.6.16]
70+
- env:
71+
- BEAKER_PUPPET_COLLECTION=puppet6
6172
- TASK=beaker:amazonlinux-1-x64:acceptance
6273
- env:
63-
- TASK=beaker:amazonlinux-1-x64:acceptance[5.6.9]
74+
- BEAKER_PUPPET_COLLECTION=puppet6
75+
- TASK=beaker:amazonlinux-1-x64:acceptance[5.6.16]
6476
- env:
77+
- BEAKER_PUPPET_COLLECTION=puppet6
6578
- TASK=beaker:oracle-6-x64:acceptance
6679
- env:
67-
- TASK=beaker:oracle-6-x64:acceptance[5.6.9]
80+
- BEAKER_PUPPET_COLLECTION=puppet6
81+
- TASK=beaker:oracle-6-x64:acceptance[5.6.16]
6882
- env:
83+
- BEAKER_PUPPET_COLLECTION=puppet6
6984
- TASK=beaker:oracle-7-x64:acceptance
7085
- env:
71-
- TASK=beaker:oracle-7-x64:acceptance[5.6.9]
86+
- BEAKER_PUPPET_COLLECTION=puppet6
87+
- TASK=beaker:oracle-7-x64:acceptance[5.6.16]
7288
- env:
89+
- BEAKER_PUPPET_COLLECTION=puppet6
7390
- TASK=beaker:debian-8-x64:acceptance
7491
- env:
75-
- TASK=beaker:debian-8-x64:acceptance[5.6.9]
92+
- BEAKER_PUPPET_COLLECTION=puppet6
93+
- TASK=beaker:debian-8-x64:acceptance[5.6.16]
7694
- env:
95+
- BEAKER_PUPPET_COLLECTION=puppet6
7796
- TASK=beaker:debian-9-x64:acceptance
7897
- env:
79-
- TASK=beaker:debian-9-x64:acceptance[5.6.9]
98+
- BEAKER_PUPPET_COLLECTION=puppet6
99+
- TASK=beaker:debian-9-x64:acceptance[5.6.16]
100+
- env:
101+
- BEAKER_PUPPET_COLLECTION=puppet6
102+
- TASK=beaker:debian-10-x64:acceptance
80103
- env:
104+
- BEAKER_PUPPET_COLLECTION=puppet6
105+
- TASK=beaker:debian-10-x64:acceptance[5.6.16]
106+
- env:
107+
- BEAKER_PUPPET_COLLECTION=puppet6
81108
- TASK=beaker:ubuntu-server-1404-x64:acceptance
82109
- env:
83-
- TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.9]
110+
- BEAKER_PUPPET_COLLECTION=puppet6
111+
- TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.16]
84112
- env:
113+
- BEAKER_PUPPET_COLLECTION=puppet6
85114
- TASK=beaker:ubuntu-server-1604-x64:acceptance
86115
- env:
87-
- TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
116+
- BEAKER_PUPPET_COLLECTION=puppet6
117+
- TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.16]
118+
- env:
119+
- BEAKER_PUPPET_COLLECTION=puppet6
120+
- TASK=beaker:ubuntu-server-1804-x64:acceptance
121+
- env:
122+
- BEAKER_PUPPET_COLLECTION=puppet6
123+
- TASK=beaker:ubuntu-server-1804-x64:acceptance[5.6.16]
88124
- stage: snapshots
89125
env:
90126
- TASK=beaker:ubuntu-server-1404-x64:snapshot

‎Gemfile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,12 @@ end
4646

4747
group :system_tests do
4848
gem 'bcrypt'
49-
gem 'beaker', '~> 3.7'
49+
gem 'beaker', '>= 4.2.0'
5050
gem 'beaker-rspec', '~> 6.0'
51+
gem 'beaker-docker'
52+
gem 'beaker-puppet'
53+
gem 'beaker-puppet_install_helper'
54+
gem 'simp-beaker-helpers'
5155
gem 'docker-api', '~> 1.0'
5256
gem 'infrataster'
5357
gem 'vault'

‎spec/acceptance/nodesets/amazonlinux-1-x64.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
HOSTS:
22
amazonlinux-1-x64:
33
roles:
4+
- agent
45
- master
56
platform: el-6-x86_64
67
image: amazonlinux:1

‎spec/acceptance/nodesets/amazonlinux-2-x64.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
HOSTS:
22
amazonlinux-2-x64:
33
roles:
4+
- agent
45
- master
56
platform: el-7-x86_64
67
image: amazonlinux:2

‎spec/acceptance/nodesets/centos-6-x64.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ HOSTS:
22
centos-6-x64:
33
roles:
44
- master
5+
- agent
56
- database
67
- dashboard
78
platform: el-6-x86_64

‎spec/acceptance/nodesets/centos-7-x64.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
HOSTS:
22
centos-7-x64:
33
roles:
4+
- agent
45
- master
56
- database
67
- dashboard

‎spec/acceptance/nodesets/centos-8-x64.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
HOSTS:
2+
centos-8-x64:
3+
roles:
4+
- agent
5+
- master
6+
- database
7+
- dashboard
8+
platform: el-8-x86_64
9+
image: centos:8
10+
hypervisor: docker
11+
docker_cmd: ["/sbin/init"]
12+
docker_preserve_image: true
13+
docker_image_commands:
14+
- yum install -y wget which cronie iproute
15+
# - mkdir -p /etc/selinux/targeted/contexts/
16+
# - echo '<busconfig><selinux></selinux></busconfig>' > /etc/selinux/targeted/contexts/dbus_contexts
17+
# - rm /lib/systemd/system/systemd*udev*
18+
# - rm /lib/systemd/system/getty.target
19+
CONFIG:
20+
log_level: warn

‎spec/acceptance/nodesets/debian-10-x64.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
HOSTS:
2+
debian-10:
3+
roles:
4+
- agent
5+
platform: debian-10-amd64
6+
image: debian:10
7+
hypervisor: docker
8+
docker_cmd: ["/bin/systemd"]
9+
docker_preserve_image: true
10+
docker_image_commands:
11+
- apt-get install -yq apt-transport-https wget net-tools gpg ruby-augeas software-properties-common
12+
- wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
13+
- add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
14+
- apt update && apt-get install -yq adoptopenjdk-8-hotspot
15+
CONFIG:
16+
log_level: warn
17+

‎spec/acceptance/nodesets/debian-8-x64.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
HOSTS:
22
debian-8:
33
roles:
4+
- agent
45
- master
56
- database
67
- dashboard

0 commit comments

Comments
 (0)