beaker-puppet 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de946f1d393facad35ab19ca4864743772344082
-  data.tar.gz: 01993f13f7f622a4ab94928b681640a07ce9706b
+  metadata.gz: 45aaed2042306a1112f8b2a9e6dabbf706b93109
+  data.tar.gz: 78b764b7a2dead1689e767ae3c701f679aea9d11
 SHA512:
-  metadata.gz: e1b58fa827fa766d54f3d900c2a7a8b2ffe9dd8ddb3ae54d8a19c23ab88f6b0a6674d45d3b23d46569c8ffec0135ba1bc7714196f4ba24ac2a3cb7ab402cb90f
-  data.tar.gz: 4d21d18da09e34b826d7a9218a7dce6eef26aeec1745e4289940e7a655332e6bc6563e31d16e7bece336700aedc83238c741ba6947ec560de3a99faa09b74165
+  metadata.gz: 16b036f31788e901df75d33dc3406eceb1378ef1863e159246c8210b01c11d3dadecec939abbb3d56f3b3ef6606753bb1eacaef7a70b3a0d5e0734e0acab98b5
+  data.tar.gz: 90ce33922dc3d708318caa95f15dcd7c2352ec97f252d7e580069b3963f86fb99bd793d18b98e7755bab4ad15e1a33d304cbdc11360b5512e01bee668425db6e

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
 end

data/setup/common/013_aix_yum_setup.rb

@@ -0,0 +1,20 @@
+case agent['platform']
+  when /aix/
+    # Bootstrap yum and dependencies
+    on(agent, "curl -O http://pl-build-tools.delivery.puppetlabs.net/aix/yum_bootstrap/rpm.rte && installp -acXYgd . rpm.rte all")
+    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")
+    on(agent, "rpm --rebuilddb && updtvpkg")
+    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")
+
+    # Use artifactory mirror for AIX toolbox packages
+    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")
+    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")
+    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")
+    if agent['platform'] == "aix-6.1-power"
+      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")
+    elsif agent['platform'] == "aix-7.1-power"
+      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")
+    elsif agent['platform'] == "aix-7.2-power"
+      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")
+    end
+end

data/setup/common/025_StopFirewall.rb

@@ -3,7 +3,12 @@ test_name "Stop firewall" do
   hosts.each do |host|
     case host['platform']
     when /debian/
-      on host, 'iptables -F'
+      result = on(host, 'which iptables', accept_all_exit_codes: true)
+      if result.exit_code == 0
+        on host, 'iptables -F'
+      else
+        logger.notify("Unable to locate `iptables` on #{host['platform']}; not attempting to clear firewall")
+      end
     when /fedora|el-7/
       on host, puppet('resource', 'service', 'firewalld', 'ensure=stopped')
     when /el-|centos/

data/setup/git/000_EnvSetup.rb

@@ -87,6 +87,11 @@ step "Unpack puppet-runtime" do
   runtime_suffix = ".tar.gz"
 
   agents.each do |host|
+
+    # If we're running on an agent, assume the user has set an image that
+    # already contains everything we would get from the runtime tarball.
+    next if host[:hypervisor] == 'docker'
+
     platform_tag = host['packaging_platform']
     if platform_tag =~ /windows/
       # the windows version is hard coded to `2012r2`. Unfortunately,

data/setup/git/010_TestSetup.rb

@@ -9,6 +9,23 @@ test_name "Install repositories on target machines..." do
 
     repositories.each do |repository|
       step "Install #{repository[:name]}"
+
+      # If we're using docker, and we've mounted the puppet directory, let's run
+      # tests from there rather than a github repo. In this case, we assume the
+      # name of the mount corresponds to the thing we're trying to install.
+      #
+      #   HOSTS:
+      #     hostname-1:
+      #       hypervisor: docker
+      #       mount_folders:
+      #         puppet:
+      #           host_path: ~/puppet
+      #           container_path: /build/puppet
+      #
+      if agent[:mount_folders]
+        mount = agent[:mount_folders][repository[:name]]
+        repository[:path] = "file://#{mount[:container_path]}"
+      end
       repo_dir = host.tmpdir(repository[:name])
       on(host, "chmod 755 #{repo_dir}")
 

data/tasks/ci.rake

@@ -262,6 +262,7 @@ def pre_suites(type)
       "#{beaker_root}/setup/aio/010_Install_Puppet_Agent.rb",
       "#{beaker_root}/setup/common/011_Install_Puppet_Server.rb",
       "#{beaker_root}/setup/common/012_Finalize_Installs.rb",
+      "#{beaker_root}/setup/common/013_aix_yum_setup.rb",
       "#{beaker_root}/setup/common/020_InstallCumulusModules.rb",
       "#{beaker_root}/setup/common/021_InstallAristaModuleMasters.rb",
       "#{beaker_root}/setup/common/022_InstallAristaModuleAgents.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -274,6 +274,7 @@ files:
 - setup/common/000-delete-puppet-when-none.rb
 - setup/common/011_Install_Puppet_Server.rb
 - setup/common/012_Finalize_Installs.rb
+- setup/common/013_aix_yum_setup.rb
 - setup/common/020_InstallCumulusModules.rb
 - setup/common/021_InstallAristaModuleMasters.rb
 - setup/common/022_InstallAristaModuleAgents.rb