beaker-pe 1.5.0 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjM1NWI4YTRlNTU0OTY1MjI4MDgxNTgwZTRkNGZmMzJiM2Y2YjE3MQ==
+    MzM1MzU5ODE2MzczZmI2YjY1NDcxZWZjNjVmMzY0ZmYwMzU4MmM4NA==
   data.tar.gz: !binary |-
-    YTQ0NjYzNzBmM2I4Y2RhY2IwMmQwYWJmMTMxYzQxYzE5MGZjMGVlOQ==
+    MDdhOTQ0YjUyMmIzZjMzNmQ3OGIwZjRiZTE5MWNkODM1N2NkMDQxMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTVjOTQyMWIzM2Q2ZGUzNTIzNTdkYWNlODM1YjA0ZDgxNzhkOTYzYmYzNTM2
-    MTZmNWI1ZTQzZTJmMDExZTc4NmFmOGJjOGI5NTk1OTIxNjJlYWNlZTkyMjM2
-    ZjE5MjAwYzJmZmM5ZjJmNjlkOWIwYTkzNmIzNzMxNjdhZThkM2E=
+    Y2Q4MDJmYmUyNjFiYWQ2NjZhMDFjZGExNDAwMWFiOGFmM2RlZTczYmMzOGM0
+    MzMzMWEzMDkwNDYwNWUxNjI2MzNmZjk3OWE4MDBlYWJmYWI1MGM3YzY1Zjk5
+    ZDk1NmViOGIwMzI1OWNhMDZhYzg4ZGEyZDRhMjE0YTIwMTdiMjk=
   data.tar.gz: !binary |-
-    MGIyYTBmYzg2Yjc2Yzk1ZTJiZTkyZWNkZDc2OGU0OTgxMDkzOTgyYzNkNThh
-    ODk5NmRjZmQ1MzllNWU1ZjcxNDQyYTJiMGE2MjI4MjhkODFjZWZmMjJhMmUx
-    ODY3NTRiMTg2MjY1NjA4NjFiZmU5OWY4YmViNzlkYWFkZTIwZmE=
+    YmM5NmY0Nzk3NjQzNDU2MmZmMGRlMzFmOTk1YWU0MmY4NzliMTU4YTRlZTJi
+    YmFlYzI0MTk1ZTBmYTNiZGQxOGViMWFjNjUyZGI4MGU2MzgzYjkyZGYzOWI3
+    MWEwMzQ1ZGJmNWMwMmZlOGRlZTNmOWUzM2M5NWIzYzZkMGU3MDE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 7 Nov, 2016 (614c736b)](#LATEST)
+* [LATEST - 16 Nov, 2016 (9d6d30e0)](#LATEST)
+* [1.5.0 - 7 Nov, 2016 (24d78992)](#1.5.0)
 * [1.4.0 - 11 Oct, 2016 (6becdbb2)](#1.4.0)
 * [1.3.0 - 6 Oct, 2016 (97f781bb)](#1.3.0)
 * [1.2.0 - 4 Oct, 2016 (7362ab78)](#1.2.0)
@@ -23,7 +24,64 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 7 Nov, 2016 (614c736b)
+### <a name = "LATEST">LATEST - 16 Nov, 2016 (9d6d30e0)
+
+* (GEM) update beaker-pe version to 1.6.0 (9d6d30e0)
+
+* Merge pull request #40 from jpartlow/issue/master/pe-18516-always-set-pe-conf-for-upgrades (ace43aca)
+
+
+```
+Merge pull request #40 from jpartlow/issue/master/pe-18516-always-set-pe-conf-for-upgrades
+
+(PE-18516,PE-18170) Temporarily set pe.conf when upgrading to Flanders
+```
+* (PE-18516,PE-18170) Temporarily set pe.conf when upgrading to Flanders (9df782ee)
+
+
+```
+(PE-18516,PE-18170) Temporarily set pe.conf when upgrading to Flanders
+
+At the moment, MEEP does not create a 2.0 pe.conf when recovering
+configuration for an upgrade.  This is preventing all upgrade tests from
+PE >= 2016.2 (when meep was introduced) to PE >= 2017.1 from completing
+because meep ends up using a 1.0 pe.conf that has no node_roles. Without
+the node_roles information, the node is not considered infrastructure,
+and meep's enc returns no classes for it, so nothing happens in the
+upgrade apply.
+
+This is not currently a problem upgrading from < 2016.2 because
+beaker-pe is providing the beaker-answers pe.conf in those cases.
+
+To work around this, I've added a check, just if we are upgrading to a
+Flanders version, which supplies the beaker-answers generated pe.conf.
+
+This patch is just intended to get upgrades from earlier meep versions
+working in CI. When we get to PE-18170 (also scheduled for Flanders)
+we'll work on improving recover configuration to generate a 2.0 pe.conf,
+with the goal being that beaker-answers should not need to provide
+anything for pe.conf for Flanders upgrades unless some additional
+parameters were added in the beaker configuration.
+```
+* Merge pull request #38 from kevpl/docs_README_fill (d8546812)
+
+
+```
+Merge pull request #38 from kevpl/docs_README_fill
+
+(MAINT) fill README doc & MAINTAINERS
+```
+* (MAINT) fill README doc & MAINTAINERS (23a40aba)
+
+
+```
+(MAINT) fill README doc & MAINTAINERS
+
+[skip ci]
+```
+### <a name = "1.5.0">1.5.0 - 7 Nov, 2016 (24d78992)
+
+* (HISTORY) update beaker-pe history for gem release 1.5.0 (24d78992)
 
 * (GEM) update beaker-pe version to 1.5.0 (614c736b)
 

data/MAINTAINERS

@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "file_format": "This MAINTAINERS file format is described at http://pup.pt/maintainers",
+  "issues": "https://tickets.puppet.com/browse/PE",
+  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-organizational-scale",
+  "people": [
+    {
+      "github": "kevpl",
+      "email": "ki@puppet.com",
+      "name": "Kevin Imber"
+    },
+    {
+      "github": "tvpartytonight",
+      "email": "tv@puppet.com",
+      "name": "Tony Vu"
+    },
+    {
+      "github": "jpartlow",
+      "email": "joshua.partlow@puppet.com",
+      "name": "Josh Partlow"
+    },
+    {
+      "github": "demophoon",
+      "email": "britt@puppet.com",
+      "name": "Britt Gresham"
+    },
+    {
+      "github": "highb",
+      "email": "brandon.high@puppet.com",
+      "name": "Brandon High"
+    },
+    {
+      "github": "ericwilliamson",
+      "email": "eric.williamson@puppet.com",
+      "name": "Eric Williamson"
+    }
+  ]
+}

data/README.md

@@ -11,6 +11,13 @@ The PE Beaker library contains all PE-specific
 
 that help someone acceptance test PE easier with Beaker.
 
+# Documentation
+
+- [Rubydocs](http://www.rubydoc.info/github/puppetlabs/beaker-pe) contain the
+technical reference for APIs and other aspects of beaker-pe. They describe
+how it works and how to use it but assume that you have a basic understanding
+of key concepts.
+
 # Upgrading from 0.y to 1.y?
 
 If you've used beaker-pe previously (during the 0.y versions), you'll
@@ -51,3 +58,17 @@ task. It should be noted that this is a shortcut for the `test:acceptance:quick`
 task, which is named as such because it uses no pre-suite.  This uses a default
 provided hosts file for acceptance under the `acceptance/config` directory. If
 you'd like to provide your own hosts file, set the `CONFIG` environment variable.
+
+# Release
+
+To release new versions, we use a
+[Jenkins job](https://jenkins-qe.delivery.puppetlabs.net/job/qe_beaker-pe_btc-rls/)
+(access to internal infrastructure will be required to view job).
+
+To release a new version (from the master branch), you'll need to just provide
+a new beaker-pe version number to the job, and you're off to the races.
+
+# Questions
+
+If you have questions, please reach out to our
+[MAINTAINERS](MAINTAINERS).

data/lib/beaker-pe/install/pe_utils.rb

@@ -123,9 +123,13 @@ module Beaker
               pe_cmd += " -y"
             end
 
+            # This is a temporary workaround for PE-18516, because MEEP does not yet create a 2.0
+            # pe.conf when recovering configuration in Flanders. This will be fixed in PE-18170.
+            if opts[:type] == :upgrade && !version_is_less(host['pe_upgrade_ver'], '2017.1.0')
+              "#{pe_cmd} #{host['pe_installer_conf_setting']}"
             # If there are no answer overrides, and we are doing an upgrade from 2016.2.0,
             # we can assume there will be a valid pe.conf in /etc that we can re-use.
-            if opts[:answers].nil? && opts[:custom_answers].nil? && opts[:type] == :upgrade && !version_is_less(opts[:HOSTS][host.name][:pe_ver], '2016.2.0')
+            elsif opts[:answers].nil? && opts[:custom_answers].nil? && opts[:type] == :upgrade && !version_is_less(opts[:HOSTS][host.name][:pe_ver], '2016.2.0')
               "#{pe_cmd}"
             else
               "#{pe_cmd} #{host['pe_installer_conf_setting']}"

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.5.0'
+        STRING = '1.6.0'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -178,6 +178,7 @@ files:
 - Gemfile
 - HISTORY.md
 - LICENSE
+- MAINTAINERS
 - README.md
 - Rakefile
 - acceptance/config/nodes/vagrant-ubuntu-1404.yml