Merge branch 'release/v1.2.0'

coi-gov-pl · Feb 6, 2017 · fc5944b · fc5944b
2 parents bca56c2 + 0db3e3b
commit fc5944b
Show file tree

Hide file tree

Showing 68 changed files with 1,019 additions and 174 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,24 +32,26 @@ matrix:
     bundler_args: "--without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-../vendor/bundle}"
   - rvm: '2.0'
     env: PUPPET_VERSION="~> 3.0"
+    gemfile: gemfiles/Gemfile20
+    bundler_args: "--without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-../vendor/bundle}"
   - rvm: '2.1'
     env: PUPPET_VERSION="~> 3.0"
   - rvm: '2.1'
     env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES=yes
   - rvm: '2.1'
     sudo: required
     services: docker
-    env: PUPPET_VERSION="3.8.5" RS_SET="centos-6-x86_64-docker"
+    env: PUPPET_VERSION="3.8.7" RS_SET="centos-6-x86_64-docker"
     script: bundle exec rake acceptance
   - rvm: '2.1'
     sudo: required
     services: docker
-    env: PUPPET_VERSION="3.8.5" RS_SET="debian-7-x86_64-docker"
+    env: PUPPET_VERSION="3.8.7" RS_SET="debian-7-x86_64-docker"
     script: bundle exec rake acceptance
   - rvm: '2.1'
     sudo: required
     services: docker
-    env: PUPPET_VERSION="3.8.5" RS_SET="ubuntu-14.04-x86_64-docker"
+    env: PUPPET_VERSION="3.8.7" RS_SET="ubuntu-14.04-x86_64-docker"
     script: bundle exec rake acceptance
   # FIXME: GH Issue #3 - Activate acceptance tests on Travis CI for Puppet Enterprise, at least 2.8.8 and 3.8.2
 notifications:

diff --git a/Gemfile b/Gemfile
@@ -8,8 +8,10 @@ group :test do
   gem 'puppet-lint',                    :require => false
   gem 'metadata-json-lint',             :require => false
   gem 'os',                             :require => false
-  gem 'beaker',                         :require => false
-  gem 'beaker-rspec',                   :require => false
+  # TODO: Pinned because beaker is supported only MRI >=2.2, remove this
+  # explicitly pinned version by the time ticket gh-org/puppet-jboss#96 is closed.
+  gem 'beaker', '< 3.1.0',              :require => false
+  gem 'beaker-rspec', '~> 5.6.0',       :require => false
   gem 'docker-api',                     :require => false
   gem 'coveralls',                      :require => false
   gem 'codeclimate-test-reporter',      :require => false

diff --git a/tests/README.md → examples/README.md b/tests/README.md → examples/README.md
diff --git a/tests/clientry.pp → examples/clientry.pp b/tests/clientry.pp → examples/clientry.pp
diff --git a/tests/datasource.pp → examples/datasource.pp b/tests/datasource.pp → examples/datasource.pp
diff --git a/tests/deploy.pp → examples/deploy.pp b/tests/deploy.pp → examples/deploy.pp
diff --git a/tests/domain/controller.pp → examples/domain/controller.pp b/tests/domain/controller.pp → examples/domain/controller.pp
diff --git a/tests/domain/node.pp → examples/domain/node.pp b/tests/domain/node.pp → examples/domain/node.pp
diff --git a/tests/domain/server.pp → examples/domain/server.pp b/tests/domain/server.pp → examples/domain/server.pp
diff --git a/tests/domain/servergroup.pp → examples/domain/servergroup.pp b/tests/domain/servergroup.pp → examples/domain/servergroup.pp
diff --git a/tests/init.pp → examples/init.pp b/tests/init.pp → examples/init.pp
diff --git a/tests/interface.pp → examples/interface.pp b/tests/interface.pp → examples/interface.pp
diff --git a/examples/jboss/as7.pp b/examples/jboss/as7.pp
@@ -0,0 +1,4 @@
+class { 'jboss':
+  product => 'jboss-as',
+  version => '7.1.1.Final',
+}
diff --git a/examples/jboss/wildfly10.pp b/examples/jboss/wildfly10.pp
@@ -0,0 +1,4 @@
+class { 'jboss':
+  product => 'wildfly',
+  version => '10.1.0.Final',
+}
diff --git a/tests/jboss/wildfly8.pp → examples/jboss/wildfly8.pp b/tests/jboss/wildfly8.pp → examples/jboss/wildfly8.pp
diff --git a/tests/jboss/wildfly9.pp → examples/jboss/wildfly9.pp b/tests/jboss/wildfly9.pp → examples/jboss/wildfly9.pp
diff --git a/tests/jmsqueue.pp → examples/jmsqueue.pp b/tests/jmsqueue.pp → examples/jmsqueue.pp
diff --git a/tests/module.pp → examples/module.pp b/tests/module.pp → examples/module.pp
diff --git a/tests/resourceadapter.pp → examples/resourceadapter.pp b/tests/resourceadapter.pp → examples/resourceadapter.pp
diff --git a/tests/securitydomain.pp → examples/securitydomain.pp b/tests/securitydomain.pp → examples/securitydomain.pp
diff --git a/tests/user.pp → examples/user.pp b/tests/user.pp → examples/user.pp
diff --git a/gemfiles/Gemfile18.facter16 b/gemfiles/Gemfile18.facter16
@@ -25,6 +25,7 @@ group :test do
 
   gem 'ruby-augeas',                    :require => false
   gem 'augeas',                         :require => false
+  gem 'nokogiri', '~> 1.5.11',          :require => false
 end
 
 group :development do

diff --git a/gemfiles/Gemfile18.facter16.lock b/gemfiles/Gemfile18.facter16.lock
@@ -27,6 +27,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.9.4)
     net-telnet (0.1.1)
+    nokogiri (1.5.11)
     os (0.9.6)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -89,6 +90,7 @@ DEPENDENCIES
   json_pure (= 1.8.3)
   metadata-json-lint
   net-ssh (= 2.9.4)
+  nokogiri (~> 1.5.11)
   os
   pry (~> 0.9.12.0)
   puppet (~> 2.7.0)
@@ -102,6 +104,3 @@ DEPENDENCIES
   specinfra (= 2.59.0)
   tins (~> 1.6.0)
   vagrant-wrapper
-
-BUNDLED WITH
-   1.12.5
diff --git a/gemfiles/Gemfile18.facter17 b/gemfiles/Gemfile18.facter17
@@ -20,12 +20,12 @@ group :test do
   gem 'tins', '~> 1.6.0',               :require => false
 
   gem 'facter', '1.7.0',                :require => false
-
   gem 'puppet', '~> 2.7.0',             :require => false
   gem 'hiera-puppet',                   :require => false
 
   gem 'ruby-augeas',                    :require => false
   gem 'augeas',                         :require => false
+  gem 'nokogiri', '~> 1.5.11',          :require => false
 end
 
 group :development do

diff --git a/gemfiles/Gemfile18.facter17.lock b/gemfiles/Gemfile18.facter17.lock
@@ -27,6 +27,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.9.4)
     net-telnet (0.1.1)
+    nokogiri (1.5.11)
     os (0.9.6)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -89,6 +90,7 @@ DEPENDENCIES
   json_pure (= 1.8.3)
   metadata-json-lint
   net-ssh (= 2.9.4)
+  nokogiri (~> 1.5.11)
   os
   pry (~> 0.9.12.0)
   puppet (~> 2.7.0)
@@ -102,6 +104,3 @@ DEPENDENCIES
   specinfra (= 2.59.0)
   tins (~> 1.6.0)
   vagrant-wrapper
-
-BUNDLED WITH
-   1.12.5
diff --git a/gemfiles/Gemfile19 b/gemfiles/Gemfile19
@@ -32,6 +32,7 @@ group :test do
 
   gem 'ruby-augeas',                    :require => false
   gem 'augeas',                         :require => false
+  gem 'nokogiri', '~> 1.6.8',           :require => false
 end
 
 group :development do

diff --git a/gemfiles/Gemfile19.lock b/gemfiles/Gemfile19.lock
@@ -378,6 +378,7 @@ DEPENDENCIES
   metadata-json-lint
   mime-types (= 2.99.2)
   net-ssh (= 2.9.4)
+  nokogiri (~> 1.6.8)
   os
   pry-debugger
   puppet (~> 3.0)
@@ -393,6 +394,3 @@ DEPENDENCIES
   tins (~> 1.6.0)
   travis
   vagrant-wrapper
-
-BUNDLED WITH
-   1.12.5
diff --git a/gemfiles/Gemfile20 b/gemfiles/Gemfile20
@@ -0,0 +1,38 @@
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
+
+group :test do
+  gem 'rake',                           :require => false unless dependencies.map {|dep| dep.name}.include?('rake')
+  # TODO: Remove this explicitly pinned version by the time ticket gh-org/puppet-jboss#84 is closed.
+  gem 'rspec-puppet', '2.3.2',          :require => false
+  gem 'puppetlabs_spec_helper',         :require => false
+  gem 'puppet-lint',                    :require => false
+  gem 'metadata-json-lint',             :require => false
+  gem 'os',                             :require => false
+  # TODO: Pinned because beaker is supported only MRI >=2.2, remove this
+  # explicitly pinned version by the time ticket gh-org/puppet-jboss#96 is closed.
+  gem 'beaker', '< 3.1.0',              :require => false
+  gem 'beaker-rspec', '< 6.0.0',        :require => false
+  gem 'docker-api',                     :require => false
+  gem 'coveralls',                      :require => false
+  gem 'codeclimate-test-reporter',      :require => false
+  gem 'simplecov',                      :require => false
+  if facterver = ENV['FACTER_VERSION']
+    gem 'facter', facterver,            :require => false
+  else
+    gem 'facter',                       :require => false
+  end
+  gem 'puppet', '~> 3.0',               :require => false
+  gem 'ruby-augeas',                    :require => false
+  gem 'augeas',                         :require => false
+  gem 'nokogiri', '~> 1.6.8',           :require => false
+end
+
+group :development do
+  gem 'inch',                           :require => false
+  gem 'vagrant-wrapper',                :require => false
+  gem 'travis',                         :require => false
+  gem 'puppet-blacksmith',              :require => false
+  gem 'pry-byebug',                     :require => false
+end
+
+# vim:ft=ruby