beaker-puppet 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a76f705896b24a8cfb4e6b7411f5f5fe17c49b
-  data.tar.gz: c6d31f1067342dea1dde3ca30ca86456279b47c6
+  metadata.gz: baf6c7573f1464e753122579affd37a18e9184c7
+  data.tar.gz: 1552fbe2833aab8842839f3f715073dd91baffa9
 SHA512:
-  metadata.gz: bcd42c7be6b6eebc6a757847b203d2460ca5c694886260707de177d8e75afb0ccbefa07d22f6efd77ca9f3697484216c5f0fad434522b52cda00dbf6ea11f521
-  data.tar.gz: 1932961b6b853d08105bd8bd8c543d294e878e72f3d45d21d2656fadb068c32dadff3dd05bf1e1458e140dac2386a02bc7a26425a44e493df9d0c1add9be693b
+  metadata.gz: b3c687b34317b0d7601e09aa7da6779b04685fb355cb662d1e5aa36cd06a9883f78d947b2f37ef7016494303b34f9b6dbfb793733f09b79d557a6d68872867aa
+  data.tar.gz: 9fcb8b9f18b67918e802599d68e3b3d0c0463a9766f9151334570f8fe53a216246883ac832295e728cb4c3e23da2267ff3450e1ce52c4bc9819c03a7bdcf7597

data/README.md

@@ -56,3 +56,13 @@ environment variable. You can also specify the tests that get executed with the
 # Contributing
 
 Please refer to puppetlabs/beaker's [contributing](https://github.com/puppetlabs/beaker/blob/master/CONTRIBUTING.md) guide.
+
+# Releasing
+
+To release new versions of beaker-puppet, please use the [jenkins job](https://cinext-jenkinsmaster-sre-prod-1.delivery.puppetlabs.net/job/qe_beaker-puppet_init-multijob_master/). This job
+lives on internal infrastructure.
+
+To run the job, click on `Build with Parameters` in the menu on the left. Make
+sure you check the box next to `PUBLIC` and enter the appropriate version. The
+version should adhere to semantic version standards. When in doubt, consult the
+maintainers of Beaker for guidance.

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -964,14 +964,14 @@ module Beaker
 
             when /^(debian|ubuntu|cumulus|huaweios)$/
               if repo_name.match(/puppet\d*/)
-                deb = "%s-release-%s.deb" % [repo_name, codename]
+                remote = "%s/%s-release-%s.deb" %
+                  [opts[:release_apt_repo_url], repo_name, codename]
               else
                 repo_name = '-' + repo_name unless repo_name.empty?
-                deb = "puppetlabs-release%s-%s.deb" % [repo_name, codename]
+                remote = "%s/puppetlabs-release%s-%s.deb" %
+                  [opts[:release_apt_repo_url], repo_name, codename]
               end
 
-              remote = URI.join( opts[:release_apt_repo_url], deb )
-
               on host, "wget -O /tmp/puppet.deb #{remote}"
               on host, "dpkg -i --force-all /tmp/puppet.deb"
               on host, "apt-get update"

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.11.1'
+  VERSION = '0.12.0'
 end

data/setup/aio/010_Install_Puppet_Agent.rb

@@ -0,0 +1,20 @@
+extend BeakerPuppet::Install::Puppet5
+extend Beaker::DSL::InstallUtils::FOSSUtils
+
+test_name "Install Packages" do
+
+  dev_builds_url  = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
+
+  step "Install puppet-agent..." do
+    sha = ENV['SHA']
+    install_from_build_data_url('puppet-agent', "#{dev_builds_url}/puppet-agent/#{sha}/artifacts/#{sha}.yaml", hosts)
+  end
+
+  # make sure install is sane, beaker has already added puppet and ruby
+  # to PATH in ~/.ssh/environment
+  agents.each do |agent|
+    on agent, puppet('--version')
+    ruby = ruby_command(agent)
+    on agent, "#{ruby} --version"
+  end
+end

data/setup/aio/011_Install_Puppet_Server.rb

@@ -0,0 +1,28 @@
+extend BeakerPuppet::Install::Puppet5
+extend Beaker::DSL::InstallUtils::FOSSUtils
+
+test_name "Install Puppet Server" do
+  server_version = ENV['SERVER_VERSION'] || 'latest'
+  release_stream = ENV['RELEASE_STREAM'] || 'puppet'
+  nightly_builds_url = ENV['NIGHTLY_BUILDS_URL'] || 'http://nightlies.puppet.com'
+  dev_builds_url  = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
+
+  if nightly_builds_url == 'http://nightlies.puppet.com'
+    yum_nightlies_url = nightly_builds_url + '/yum'
+    apt_nightlies_url = nightly_builds_url + '/apt'
+  else
+    yum_nightlies_url = nightly_builds_url
+    apt_nightlies_url = nightly_builds_url
+  end
+
+  if server_version == 'latest'
+    opts = {
+      :release_yum_repo_url => yum_nightlies_url,
+      :release_apt_repo_url => apt_nightlies_url
+    }
+    install_puppetlabs_release_repo_on(master, "#{release_stream}-nightly", opts)
+    master.install_package('puppetserver')
+  else
+    install_from_build_data_url('puppetserver', "#{dev_builds_url}/puppetserver/#{server_version}/artifacts/#{server_version}.yaml", master)
+  end
+end

data/setup/aio/012_Finalize_Installs.rb

@@ -0,0 +1,27 @@
+extend Beaker::DSL::InstallUtils::FOSSUtils
+
+test_name "Finalize Host Installation"
+
+step "Verify host times" do
+  # Get a rough estimate of clock skew among hosts
+  times = []
+  hosts.each do |host|
+    ruby = ruby_command(host)
+    on(host, "#{ruby} -e 'puts Time.now.strftime(\"%Y-%m-%d %T.%L %z\")'") do |result|
+      times << result.stdout.chomp
+    end
+  end
+  times.map! do |time|
+    (Time.strptime(time, "%Y-%m-%d %T.%L %z").to_f * 1000.0).to_i
+  end
+  diff = times.max - times.min
+  if diff < 60000
+    logger.info "Host times vary #{diff} ms"
+  else
+    logger.warn "Host times vary #{diff} ms, tests may fail"
+  end
+end
+
+step "Configure gem mirror" do
+  configure_gem_mirror(hosts)
+end

data/tasks/ci.rake

@@ -202,7 +202,9 @@ def pre_suites(type)
   when :aio
     [
       "#{beaker_root}/setup/common/000-delete-puppet-when-none.rb",
-      "#{beaker_root}/setup/aio/010_Install.rb",
+      "#{beaker_root}/setup/aio/010_Install_Puppet_Agent.rb",
+      "#{beaker_root}/setup/aio/011_Install_Puppet_Server.rb",
+      "#{beaker_root}/setup/aio/012_Finalize_Installs.rb",
       "#{beaker_root}/setup/aio/020_InstallCumulusModules.rb",
       "#{beaker_root}/setup/aio/021_InstallAristaModule.rb",
       "#{beaker_root}/setup/common/025_StopFirewall.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Puppet
@@ -233,7 +233,9 @@ files:
 - lib/beaker/dsl/install_utils/foss_utils.rb
 - lib/beaker/dsl/install_utils/module_utils.rb
 - lib/beaker/dsl/install_utils/puppet_utils.rb
-- setup/aio/010_Install.rb
+- setup/aio/010_Install_Puppet_Agent.rb
+- setup/aio/011_Install_Puppet_Server.rb
+- setup/aio/012_Finalize_Installs.rb
 - setup/aio/020_InstallCumulusModules.rb
 - setup/aio/021_InstallAristaModule.rb
 - setup/aio/045_EnsureMasterStarted.rb

data/setup/aio/010_Install.rb

@@ -1,50 +0,0 @@
-extend BeakerPuppet::Install::Puppet5
-extend Beaker::DSL::InstallUtils::FOSSUtils
-
-test_name "Install Packages"
-
-dev_builds_url  = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
-nightly_builds_url = ENV['NIGHTLY_BUILDS_URL'] || "http://ravi.puppetlabs.com"
-
-step "Install puppet-agent..." do
-  sha = ENV['SHA']
-  install_from_build_data_url('puppet-agent', "#{dev_builds_url}/puppet-agent/#{sha}/artifacts/#{sha}.yaml", hosts)
-end
-
-step "Install puppetserver..." do
-  if ENV['SERVER_VERSION'].nil? || ENV['SERVER_VERSION'] == 'latest'
-    install_puppetlabs_dev_repo(master, 'puppetserver', 'latest', nil, :dev_builds_url => nightly_builds_url)
-    master.install_package('puppetserver')
-  else
-    server_version = ENV['SERVER_VERSION']
-    install_from_build_data_url('puppetserver', "#{dev_builds_url}/puppetserver/#{server_version}/artifacts/#{server_version}.yaml", master)
-  end
-end
-
-# make sure install is sane, beaker has already added puppet and ruby
-# to PATH in ~/.ssh/environment
-agents.each do |agent|
-  on agent, puppet('--version')
-  ruby = ruby_command(agent)
-  on agent, "#{ruby} --version"
-end
-
-# Get a rough estimate of clock skew among hosts
-times = []
-hosts.each do |host|
-  ruby = ruby_command(host)
-  on(host, "#{ruby} -e 'puts Time.now.strftime(\"%Y-%m-%d %T.%L %z\")'") do |result|
-    times << result.stdout.chomp
-  end
-end
-times.map! do |time|
-  (Time.strptime(time, "%Y-%m-%d %T.%L %z").to_f * 1000.0).to_i
-end
-diff = times.max - times.min
-if diff < 60000
-  logger.info "Host times vary #{diff} ms"
-else
-  logger.warn "Host times vary #{diff} ms, tests may fail"
-end
-
-configure_gem_mirror(hosts)