beaker 3.8.0 → 3.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +8 -8
  2. data/acceptance/fixtures/files/sles-11-x86_64.repo.txt +5 -0
  3. data/acceptance/fixtures/files/sles-12-x86_64.repo.txt +5 -0
  4. data/acceptance/fixtures/package/deb/pl-puppetserver-latest-xenial.list +1 -0
  5. data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-24-x86_64.repo +6 -0
  6. data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-sles-12-x86_64.repo +6 -0
  7. data/acceptance/tests/base/dsl/helpers/host_helpers/deploy_package_repo_test.rb +3 -3
  8. data/acceptance/tests/base/host/packages.rb +1 -0
  9. data/acceptance/tests/base/host/packages_unix.rb +1 -1
  10. data/lib/beaker/platform.rb +5 -2
  11. data/lib/beaker/version.rb +1 -1
  12. metadata +7 -3
  13. data/acceptance/fixtures/files/sles-11-x86_64.repo +0 -5
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- N2JkMGY5N2Y2NGU1YWU2NmZhZTJhZjdkNDkyMGZkODk2N2ExMGE2MA==
4
+ MDY0YzA0OTYzZWUyZDJiZmIzODQ1Y2I2MzkzMDE2ZDFjYTM4Y2VlOA==
5
5
  data.tar.gz: !binary |-
6
- YzY5ZGQ4NjQ4YzNlOWE0NDk5ZDRkMWMwMWU0ZGE0MzgwODYxZDFiZg==
6
+ MzE2ODZhNDQxOWY4OTczMzZiNWQ4NzViYzFlNTFkOGFmZGJlMjJjMQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MDdmMjA2ZWFlZTkyMGI2YjMwZTIzM2ZhNGQwZWZiMzEwMGU0OGZkMDliNTJi
10
- MTYyNGM0OGMxYjdkNDBkOTdmZmI4NWY0MzdhYTJkMDFlNzFlMDhlMDdkMDc0
11
- NjczMjkyM2U2MzFhNTQ5NjdmMjc5M2NiMmE3MTBiMDc0OWM0YTM=
9
+ M2MyM2FiYjEyNDE5NzI4YWE5YzliYjEzMzI4M2M3MGI0NDQ0NmRiMTYzMDc1
10
+ OGM5Njc4MzBjMDUxYmU4ZjY5YjQ5YWQ0YTJmZDRkMWZiODE3MWFmNTNkNjA2
11
+ NWRiOGJiNDllZGM5MDFjYzEwYzBiYjJlZmI5NGQ2OTdkZGViNDU=
12
12
  data.tar.gz: !binary |-
13
- ZjgwMTliODVjYjFmYjk3M2MzMWFkYzhmMDRmYmFlMGExNWE3MDMwMTM3MmYy
14
- MDQ5ZTcwYmY1ZWE2NzhkNjEzZDUxOGEzMTMzNjczYjIwNmY0YjM5ZDkyZDE2
15
- ZjQ5N2VhN2ZjMmVkMGNjOWJiNTUxNmM5YjA4MzUzY2UzMDFmNTQ=
13
+ M2Y5OWE2NGJiYjFjNjFlNzhlNWI2M2UwMWIyNjA1ZjU2OTExMWRjMjM5NDQy
14
+ MTYzY2JiODcxNmI5YjMxM2M2NDZjOTZiOWZlN2I3ZDI2YTlmZjI0ODIyYjYz
15
+ NzNhMzRjYWMyNjM2NWVkOTY3YWFjZTY4ZjEwNTgyNzYyMzdiZTQ=
data/acceptance/fixtures/files/sles-11-x86_64.repo.txt ADDED
@@ -0,0 +1,5 @@
1
+ [PE-2016.4-sles-11-x86_64]
2
+ name=PE-2016.4-sles-11-x86_64
3
+ baseurl=http://enterprise.delivery.puppetlabs.net/2016.4/repos/sles-11-x86_64
4
+ enabled=1
5
+ gpgcheck=0
data/acceptance/fixtures/files/sles-12-x86_64.repo.txt ADDED
@@ -0,0 +1,5 @@
1
+ [PE-2016.4-sles-12-x86_64]
2
+ name=PE-2016.4-sles-12-x86_64
3
+ baseurl=http://enterprise.delivery.puppetlabs.net/2016.4/repos/sles-12-x86_64
4
+ enabled=1
5
+ gpgcheck=0
data/acceptance/fixtures/package/deb/pl-puppetserver-latest-xenial.list ADDED
@@ -0,0 +1 @@
1
+ deb http://nightlies.puppetlabs.com/puppetserver-latest/repos/apt/xenial xenial PC1
data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-24-x86_64.repo ADDED
@@ -0,0 +1,6 @@
1
+ [pl-puppetserver-latest]
2
+ name=PL Repo for puppetserver at commit latest
3
+ baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/fedora/f24/PC1/x86_64/
4
+ enabled=1
5
+ gpgcheck=1
6
+ gpgkey=http://nightlies.puppetlabs.com/07BB6C57
data/acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-sles-12-x86_64.repo ADDED
@@ -0,0 +1,6 @@
1
+ [pl-puppetserver-latest]
2
+ name=PL Repo for puppetserver at commit latest
3
+ baseurl=http://nightlies.puppetlabs.com/puppetserver-latest/repos/sles/12/PC1/x86_64/
4
+ enabled=1
5
+ gpgcheck=1
6
+ gpgkey=http://nightlies.puppetlabs.com/07BB6C57
data/acceptance/tests/base/dsl/helpers/host_helpers/deploy_package_repo_test.rb CHANGED
@@ -106,15 +106,15 @@ test_name "dsl::helpers::host_helpers #deploy_package_repo" do
106
106
  platform = default['platform']
107
107
 
108
108
  FileUtils.mkdir(File.join(local_dir, "rpm"))
109
- local_filename, contents = create_local_file_from_fixture("sles-11-x86_64.repo", File.join(local_dir, "rpm"), "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
109
+ local_filename, contents = create_local_file_from_fixture("#{default["platform"]}.repo", File.join(local_dir, "rpm"), "pl-#{name}-#{version}-repos-pe-#{platform}.repo")
110
110
 
111
111
  deploy_package_repo default, local_dir, name, version
112
112
 
113
113
  result = on default, "zypper repos -d"
114
- assert_match "PE-3.8-sles-11-x86_64", result.stdout
114
+ assert_match "PE-2016.4-#{default['platform']}", result.stdout
115
115
 
116
116
  # teardown
117
- on default, "zypper rr PE-3.8-sles-11-x86_64"
117
+ on default, "zypper rr #{default['platform']}"
118
118
  end
119
119
  end
120
120
  end
data/acceptance/tests/base/host/packages.rb CHANGED
@@ -51,6 +51,7 @@ hosts.each do |host|
51
51
  # a lot of dependencies.
52
52
  package = 'zsh'
53
53
  package = 'CSWzsh' if host['platform'] =~ /solaris-10/
54
+ package = 'git' if host['platform'] =~ /sles/
54
55
 
55
56
  if host['platform'] =~ /solaris-11/
56
57
  logger.debug("#{package} should be uninstalled on #{host}")
data/acceptance/tests/base/host/packages_unix.rb CHANGED
@@ -56,7 +56,7 @@ end
56
56
 
57
57
  step '#deploy_package_repo : deploy puppet-server nightly repo'
58
58
  hosts.each do |host|
59
- next if host['platform'] =~ /fedora/
59
+ next if host['platform'].variant == 'sles' && Integer(host['platform'].version) < 12
60
60
  host.deploy_package_repo(pkg_fixtures, pkg_name, 'latest')
61
61
  clean_file(host, pkg_name)
62
62
  end
data/lib/beaker/platform.rb CHANGED
@@ -6,11 +6,14 @@ module Beaker
6
6
  PLATFORMS = /^(huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
7
7
  # Platform version numbers vs. codenames conversion hash
8
8
  PLATFORM_VERSION_CODES =
9
- { :debian => { "jessie" => "8",
9
+ { :debian => { "stretch" => "9",
10
+ "jessie" => "8",
10
11
  "wheezy" => "7",
11
12
  "squeeze" => "6",
12
13
  },
13
- :ubuntu => { "xenial" => "1604",
14
+ :ubuntu => { "zesty" => "1704",
15
+ "yakkety" => "1610",
16
+ "xenial" => "1604",
14
17
  "wily" => "1510",
15
18
  "vivid" => "1504",
16
19
  "utopic" => "1410",
data/lib/beaker/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Beaker
2
2
  module Version
3
- STRING = '3.8.0'
3
+ STRING = '3.9.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.8.0
4
+ version: 3.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-11 00:00:00.000000000 Z
11
+ date: 2017-01-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -435,7 +435,8 @@ files:
435
435
  - acceptance/fixtures/files/retry_script.txt
436
436
  - acceptance/fixtures/files/shell_script_with_output.txt
437
437
  - acceptance/fixtures/files/simple_text_file.txt
438
- - acceptance/fixtures/files/sles-11-x86_64.repo
438
+ - acceptance/fixtures/files/sles-11-x86_64.repo.txt
439
+ - acceptance/fixtures/files/sles-12-x86_64.repo.txt
439
440
  - acceptance/fixtures/module/Gemfile
440
441
  - acceptance/fixtures/module/README.md
441
442
  - acceptance/fixtures/module/Rakefile
@@ -467,6 +468,7 @@ files:
467
468
  - acceptance/fixtures/package/deb/pl-puppetserver-latest-vivid.list
468
469
  - acceptance/fixtures/package/deb/pl-puppetserver-latest-wheezy.list
469
470
  - acceptance/fixtures/package/deb/pl-puppetserver-latest-wily.list
471
+ - acceptance/fixtures/package/deb/pl-puppetserver-latest-xenial.list
470
472
  - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-el-6-i386.repo
471
473
  - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-el-6-x86_64.repo
472
474
  - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-el-7-i386.repo
@@ -479,6 +481,8 @@ files:
479
481
  - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-x86_64.repo
480
482
  - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-i386.repo
481
483
  - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-23-x86_64.repo
484
+ - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-24-x86_64.repo
485
+ - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-sles-12-x86_64.repo
482
486
  - acceptance/lib/beaker/acceptance/install_utils.rb
483
487
  - acceptance/lib/helpers/test_helper.rb
484
488
  - acceptance/pre_suite/README.md
data/acceptance/fixtures/files/sles-11-x86_64.repo DELETED
@@ -1,5 +0,0 @@
1
- [PE-3.8-sles-11-x86_64]
2
- name=PE-3.8-sles-11-x86_64
3
- baseurl=http://enterprise.delivery.puppetlabs.net/3.8/repos/sles-11-x86_64
4
- enabled=1
5
- gpgcheck=0