beaker-hostgenerator 0.10.3 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY4NTdmNzQyMWE5NWNmMDZjOTg4MTc1ZDgxZDI3ODY2MzFhZTIyMA==
+    OTBkOTc3OGMxOWU5YWI2YmIzZWM2MzVkZWJkZDhkYTFlODgwYWJlNg==
   data.tar.gz: !binary |-
-    ZDZiNzQxNDgyMjFhNWViNzhmYzU1ZmIxY2FhNzExYWI4YmQwOTE1ZQ==
+    MDRjNjgxODdhYzBhYzg5MTZjNTk3YjljOGNhNTEwYzNmODhhMTFmOA==
 SHA512:
   metadata.gz: !binary |-
-    YjJjZDA1NzMxZjU0ZWZiN2I3MWM1N2U2NzMwMzlhOTk3YmY4NzllMGJjMjFi
-    ODNiYTMyYjllN2JhNjI3NmRmOTJhMGNlMjk4MGUzN2I2YWE1Y2Q1OWNmY2Mw
-    ZGY2MTBlZTkyNDYwMTBjYmVkOTdjZGUwYmZmN2YwZmUyNzg5ZDA=
+    N2FiMDkzMTg5YTE1YzllMGViYmUyN2M3N2ZjMmMwNjNjZWJhZGU1YTQzYzFh
+    OTFiMGI4MmZhYjQxYzQ1YjljMGFkMjIzNGZlMmFiY2E3MDUwMzNlZDhmZmUx
+    ZDBkYjdlMDMxY2U3ZWI5Y2JlYzI3ZjZiOWJlZTZhNzc0NWIwZDc=
   data.tar.gz: !binary |-
-    ZDk5NDE2MTYzZTAxNTE4ODFhYWU4NzI4OGQ3MGVkNWFjMWYxZWVkZmU4ZTBm
-    NWNmOWY1M2NlYmY1ODQ3YTQ3ZmQxZWRkOTcxM2YxODMyZjFiNjkwM2VhNWRi
-    NTE1ODhmNDViYjFiNWZjNWU3NmFiOTM3NGJmOGI0YjYwMDQ1MzI=
+    MDBjMDg0Y2Y5Y2IxZjFlNjAyN2Q3ODkwYTUxN2UwNTRiZjAxMmNhYmYyMTk4
+    ODI4ZWE4NjE2MjI3MjI2MGJlYzFlNWZhMjJmNjQzYWJmM2E4YTRlZGQ2NmE3
+    ODQyNTNhNzMwOTY2NmI4NjA4YjMwYWY1ZDcwZmFmZGQzMWUyZWI=

data/CHANGELOG.md

@@ -4,6 +4,56 @@ All notable changes to this project will be documented in this file.
 This project makes a strong effort to adhere to [Semantic
 Versioning](http://semver.org).
 
+## [1.0.0] - 2017-8-14
+- Rewrite pe_dir() to provide RC builds and to determine build source just from
+  the pe_version format.
+
+  Previously, source was either archives/releases if version and family
+  were the exact same string, otherwise ci-ready.
+
+  Recently we have added archives/internal which houses rc tagged builds
+  long term (ci-ready has a two-week life span).  These internal archive
+  releases let us test rc builds for internal consumption, but introduced
+  a third source.
+
+  Fourth source, actually, I'd forgotten that we already had dev version
+  strings with PEZ in them that need to be sourced from
+  feature/ci-ready...
+
+  The patch bases everything off the version because the four cases are
+  mutually exclusive, and the previous determination of a release source
+  based on version == family doesn't make sense for anything but a release
+  version.  (If you supplied dev builds for both, for example, you
+  would get a host config trying to lookup a dev build in archive/releases
+  where it would not be found...)
+
+  This patch keeps the behavior of returning nil if either version or
+  family is nil so as to preserve a fallback behavior that would have
+  Beaker instead pick up pe_dir from environment variables: BEAKER_PE_DIR
+  or pe_dist_dir.
+
+- Drop use of pe_family/pe_upgrade_family
+
+  The pe_family and pe_upgrade_family environment variables were only
+  being used as a means of signaling that we want pe_dir to be
+  archives/releases. (If pe_version and pe_family were equal, we'd return
+  archives/releases for pe_dir).  This behavior was changed in the
+  previous commit to instead base the tarball source on the version string
+  format.
+
+  The only other behavior that passing family had was that if either
+  verison or family were nil, pe_dir would be nil. So theoretically, if
+  you only set pe_version to some valid version, you would get a beaker
+  config with no pe_dir set, and Beaker could then set pe_dir based on
+  BEAKER_PE_DIR or pe_dist_dir environment variables.
+
+  This commit removes family so that we can clean up pipelines which would
+  otherwise be setting pe_family just for the purpose of avoiding this
+  behavior.
+
+  It is potentially a breaking change if someone was relying on the
+  absence of pe_family to allow Beaker to set pe_dir as mentioned above.
+
 ## [0.10.3] - 2017-7-26
 - Change ubuntu1604-POWER platform from 'ubuntu-16.04-power8' to
   'ubuntu-16.04-ppc64el'

data/lib/beaker-hostgenerator/data.rb

@@ -14,33 +14,31 @@ module BeakerHostGenerator
   module Data
     module_function
 
+    PE_TARBALL_SERVER="http://enterprise.delivery.puppetlabs.net"
+
     def pe_version
       ENV['pe_version']
     end
 
-    def pe_family
-      ENV['pe_family']
-    end
-
     def pe_upgrade_version
       ENV['pe_upgrade_version']
     end
 
-    def pe_upgrade_family
-      ENV['pe_upgrade_family']
-    end
+    def pe_dir(version)
+      return if version.nil?
 
-    def pe_dir(version, family)
-      # If our version is the same as our family, we're installing a
-      # released version. Use the archive path. Otherwise, we want to use
-      # the development build path.
-      if version && family
-        if version == family
-          "http://enterprise.delivery.puppetlabs.net/archives/releases/#{family}/"
-        else
-          "http://enterprise.delivery.puppetlabs.net/#{family}/ci-ready"
-        end
+      base_regex = '(\A\d+\.\d+)\.\d+'
+      source = case version
+      when /#{base_regex}\Z/
+        then "#{PE_TARBALL_SERVER}/archives/releases/#{version}/"
+      when /#{base_regex}-rc\d+\Z/
+        then "#{PE_TARBALL_SERVER}/archives/internal/%s/"
+      when /#{base_regex}-.*PEZ_.*/
+        then "#{PE_TARBALL_SERVER}/%s/feature/ci-ready"
+      when /#{base_regex}-.*/
+        then "#{PE_TARBALL_SERVER}/%s/ci-ready"
       end
+      return sprintf(source, $1)
     end
 
     PE_USE_WIN32 = ENV['pe_use_win32']
@@ -55,9 +53,9 @@ module BeakerHostGenerator
 
     def base_host_config(options)
       {
-        'pe_dir' => options[:pe_dir] || pe_dir(pe_version, pe_family),
+        'pe_dir' => options[:pe_dir] || pe_dir(pe_version),
         'pe_ver' => options[:pe_ver] || pe_version,
-        'pe_upgrade_dir' => options[:pe_upgrade_dir] || pe_dir(pe_upgrade_version, pe_upgrade_family),
+        'pe_upgrade_dir' => options[:pe_upgrade_dir] || pe_dir(pe_upgrade_version),
         'pe_upgrade_ver' => options[:pe_upgrade_ver] || pe_upgrade_version,
       }
     end

data/lib/beaker-hostgenerator/util.rb

@@ -7,8 +7,8 @@ module BeakerHostGenerator
   module Utils
     module_function
 
-    def pe_dir(version, family)
-      BeakerHostGenerator::Data.pe_dir(version, family)
+    def pe_dir(version, family = nil)
+      BeakerHostGenerator::Data.pe_dir(version)
     end
 
     def fixup_node(cfg)

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.10.3'
+    STRING = '1.0.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest