beaker-hostgenerator 1.2.7 → 1.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 872636066ef4764b18f301abb8a56794444f59ba0c09f744da73dfe2c8d1c27c
|
|
4
|
+
data.tar.gz: 656c7cb00f526ec54fa4f33393e796d9d9de779899b7631260ce10262ff7ecd8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d10353af7b5f09d9afeccbcbdaa484a7ebd5a68734701599a288de6ab6d1f688613426f7d8e904426765b9fa13980f34c7e475140fbd58d79e4cd2c6d30bdef6
|
|
7
|
+
data.tar.gz: 75a150fc247c742778feb8fb37c7997991a0bf281b467a3b0f8e0c02d9c4b90543fae2d9aef0788059b0bb654a35da410040ac910cd6a0a75e144e04d9dfc5f8
|
|
@@ -14,6 +14,7 @@ module BeakerHostGenerator
|
|
|
14
14
|
module Data
|
|
15
15
|
module_function
|
|
16
16
|
MASTER_PE_VERSION=2019.5
|
|
17
|
+
MAIN_PE_VERSION=2021.0
|
|
17
18
|
PE_TARBALL_SERVER="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local"
|
|
18
19
|
|
|
19
20
|
def pe_version
|
|
@@ -41,15 +42,23 @@ module BeakerHostGenerator
|
|
|
41
42
|
''
|
|
42
43
|
end
|
|
43
44
|
|
|
44
|
-
|
|
45
|
+
gem_version = Gem::Version.new($1)
|
|
46
|
+
if(gem_version < Gem::Version.new("#{MASTER_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/)
|
|
45
47
|
pe_branch = $1
|
|
46
|
-
|
|
48
|
+
elsif gem_version < Gem::Version.new("#{MAIN_PE_VERSION}")
|
|
47
49
|
#Is this a Master PEZ build?
|
|
48
50
|
if(version =~ /.*(PEZ|pez)_.*/)
|
|
49
51
|
pe_branch = "master/feature"
|
|
50
52
|
else
|
|
51
53
|
pe_branch = 'master'
|
|
52
54
|
end
|
|
55
|
+
else
|
|
56
|
+
#Is this a Main PEZ build?
|
|
57
|
+
if(version =~ /.*(PEZ|pez)_.*/)
|
|
58
|
+
pe_branch = "main/feature"
|
|
59
|
+
else
|
|
60
|
+
pe_branch = 'main'
|
|
61
|
+
end
|
|
53
62
|
end
|
|
54
63
|
|
|
55
64
|
return sprintf(source, ("#{pe_branch}" || ''))
|
|
@@ -11,7 +11,7 @@ module BeakerHostGenerator
|
|
|
11
11
|
if node_info['ostype'] =~ /^centos/
|
|
12
12
|
base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1')
|
|
13
13
|
elsif node_info['ostype'] =~ /^fedora/
|
|
14
|
-
base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + 'cloud-base'
|
|
14
|
+
base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + '-cloud-base'
|
|
15
15
|
else
|
|
16
16
|
base_config['box'] = "generic/#{node_info['ostype']}"
|
|
17
17
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: beaker-hostgenerator
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Branan Purvine-Riley
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2020-09-
|
|
13
|
+
date: 2020-09-29 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: minitest
|