beaker-puppet 1.8.0 → 1.9.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: de946f1d393facad35ab19ca4864743772344082
4
- data.tar.gz: 01993f13f7f622a4ab94928b681640a07ce9706b
3
+ metadata.gz: 45aaed2042306a1112f8b2a9e6dabbf706b93109
4
+ data.tar.gz: 78b764b7a2dead1689e767ae3c701f679aea9d11
5
5
  SHA512:
6
- metadata.gz: e1b58fa827fa766d54f3d900c2a7a8b2ffe9dd8ddb3ae54d8a19c23ab88f6b0a6674d45d3b23d46569c8ffec0135ba1bc7714196f4ba24ac2a3cb7ab402cb90f
7
- data.tar.gz: 4d21d18da09e34b826d7a9218a7dce6eef26aeec1745e4289940e7a655332e6bc6563e31d16e7bece336700aedc83238c741ba6947ec560de3a99faa09b74165
6
+ metadata.gz: 16b036f31788e901df75d33dc3406eceb1378ef1863e159246c8210b01c11d3dadecec939abbb3d56f3b3ef6606753bb1eacaef7a70b3a0d5e0734e0acab98b5
7
+ data.tar.gz: 90ce33922dc3d708318caa95f15dcd7c2352ec97f252d7e580069b3963f86fb99bd793d18b98e7755bab4ad15e1a33d304cbdc11360b5512e01bee668425db6e
@@ -1,3 +1,3 @@
1
1
  module BeakerPuppet
2
- VERSION = '1.8.0'
2
+ VERSION = '1.9.0'
3
3
  end
@@ -0,0 +1,20 @@
1
+ case agent['platform']
2
+ when /aix/
3
+ # Bootstrap yum and dependencies
4
+ on(agent, "curl -O http://pl-build-tools.delivery.puppetlabs.net/aix/yum_bootstrap/rpm.rte && installp -acXYgd . rpm.rte all")
5
+ on(agent, "curl http://pl-build-tools.delivery.puppetlabs.net/aix/yum_bootstrap/openssl-1.0.2.1500.tar | tar xvf - && cd openssl-1.0.2.1500 && installp -acXYgd . openssl.base all")
6
+ on(agent, "rpm --rebuilddb && updtvpkg")
7
+ on(agent, "mkdir -p /tmp/yum_bundle && cd /tmp/yum_bundle/ && curl -O http://pl-build-tools.delivery.puppetlabs.net/aix/yum_bootstrap/yum_bundle.tar && tar xvf yum_bundle.tar && rpm -Uvh /tmp/yum_bundle/*.rpm")
8
+
9
+ # Use artifactory mirror for AIX toolbox packages
10
+ on(agent, "/usr/bin/sed 's/enabled=1/enabled=0/g' /opt/freeware/etc/yum/yum.conf > tmp.$$ && mv tmp.$$ /opt/freeware/etc/yum/yum.conf")
11
+ on(agent, "echo '[AIX_Toolbox_mirror]\nname=AIX Toolbox local mirror\nbaseurl=https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc/\ngpgcheck=0' > /opt/freeware/etc/yum/repos.d/toolbox-generic-mirror.repo")
12
+ on(agent, "echo '[AIX_Toolbox_noarch_mirror]\nname=AIX Toolbox noarch repository\nbaseurl=https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/noarch/\ngpgcheck=0' > /opt/freeware/etc/yum/repos.d/toolbox-noarch-mirror.repo")
13
+ if agent['platform'] == "aix-6.1-power"
14
+ on(agent, "echo '[AIX_Toolbox_61_mirror]\nname=AIX 61 specific repository\nbaseurl=https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc-6.1/\ngpgcheck=0' > /opt/freeware/etc/yum/repos.d/toolbox-61-mirror.repo")
15
+ elsif agent['platform'] == "aix-7.1-power"
16
+ on(agent, "echo '[AIX_Toolbox_71_mirror]\nname=AIX 71 specific repository\nbaseurl=https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc-7.1/\ngpgcheck=0' > /opt/freeware/etc/yum/repos.d/toolbox-71-mirror.repo")
17
+ elsif agent['platform'] == "aix-7.2-power"
18
+ on(agent, "echo '[AIX_Toolbox_72_mirror]\nname=AIX 72 specific repository\nbaseurl=https://artifactory.delivery.puppetlabs.net/artifactory/rpm__remote_aix_linux_toolbox/RPMS/ppc-7.2/\ngpgcheck=0' > /opt/freeware/etc/yum/repos.d/toolbox-72-mirror.repo")
19
+ end
20
+ end
@@ -3,7 +3,12 @@ test_name "Stop firewall" do
3
3
  hosts.each do |host|
4
4
  case host['platform']
5
5
  when /debian/
6
- on host, 'iptables -F'
6
+ result = on(host, 'which iptables', accept_all_exit_codes: true)
7
+ if result.exit_code == 0
8
+ on host, 'iptables -F'
9
+ else
10
+ logger.notify("Unable to locate `iptables` on #{host['platform']}; not attempting to clear firewall")
11
+ end
7
12
  when /fedora|el-7/
8
13
  on host, puppet('resource', 'service', 'firewalld', 'ensure=stopped')
9
14
  when /el-|centos/
@@ -87,6 +87,11 @@ step "Unpack puppet-runtime" do
87
87
  runtime_suffix = ".tar.gz"
88
88
 
89
89
  agents.each do |host|
90
+
91
+ # If we're running on an agent, assume the user has set an image that
92
+ # already contains everything we would get from the runtime tarball.
93
+ next if host[:hypervisor] == 'docker'
94
+
90
95
  platform_tag = host['packaging_platform']
91
96
  if platform_tag =~ /windows/
92
97
  # the windows version is hard coded to `2012r2`. Unfortunately,
@@ -9,6 +9,23 @@ test_name "Install repositories on target machines..." do
9
9
 
10
10
  repositories.each do |repository|
11
11
  step "Install #{repository[:name]}"
12
+
13
+ # If we're using docker, and we've mounted the puppet directory, let's run
14
+ # tests from there rather than a github repo. In this case, we assume the
15
+ # name of the mount corresponds to the thing we're trying to install.
16
+ #
17
+ # HOSTS:
18
+ # hostname-1:
19
+ # hypervisor: docker
20
+ # mount_folders:
21
+ # puppet:
22
+ # host_path: ~/puppet
23
+ # container_path: /build/puppet
24
+ #
25
+ if agent[:mount_folders]
26
+ mount = agent[:mount_folders][repository[:name]]
27
+ repository[:path] = "file://#{mount[:container_path]}"
28
+ end
12
29
  repo_dir = host.tmpdir(repository[:name])
13
30
  on(host, "chmod 755 #{repo_dir}")
14
31
 
data/tasks/ci.rake CHANGED
@@ -262,6 +262,7 @@ def pre_suites(type)
262
262
  "#{beaker_root}/setup/aio/010_Install_Puppet_Agent.rb",
263
263
  "#{beaker_root}/setup/common/011_Install_Puppet_Server.rb",
264
264
  "#{beaker_root}/setup/common/012_Finalize_Installs.rb",
265
+ "#{beaker_root}/setup/common/013_aix_yum_setup.rb",
265
266
  "#{beaker_root}/setup/common/020_InstallCumulusModules.rb",
266
267
  "#{beaker_root}/setup/common/021_InstallAristaModuleMasters.rb",
267
268
  "#{beaker_root}/setup/common/022_InstallAristaModuleAgents.rb",
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.0
4
+ version: 1.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-11-05 00:00:00.000000000 Z
11
+ date: 2018-11-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -274,6 +274,7 @@ files:
274
274
  - setup/common/000-delete-puppet-when-none.rb
275
275
  - setup/common/011_Install_Puppet_Server.rb
276
276
  - setup/common/012_Finalize_Installs.rb
277
+ - setup/common/013_aix_yum_setup.rb
277
278
  - setup/common/020_InstallCumulusModules.rb
278
279
  - setup/common/021_InstallAristaModuleMasters.rb
279
280
  - setup/common/022_InstallAristaModuleAgents.rb