Merge pull request #84 from treydock/ubuntu

Support Ubuntu 18.04
treydock · Sep 5, 2019 · 7b49953 · 7b49953
2 parents 2373a6b + 1a86103
commit 7b49953
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 19 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -8,10 +8,10 @@ fixtures:
       ref: 3.10.0
     postgresql:
       repo: https://github.com/puppetlabs/puppetlabs-postgresql.git
-      ref: 5.0.0
+      ref: 5.7.0
     java:
       repo: https://github.com/puppetlabs/puppetlabs-java.git
-      ref: 2.2.0
+      ref: 3.0.0
     java_ks:
       repo: https://github.com/puppetlabs/puppetlabs-java_ks.git
       ref: 1.4.1

diff --git a/.sync.yml b/.sync.yml
@@ -18,16 +18,22 @@
   docker_sets:
     - set: centos-7
       collection: puppet5
+      extra_envs:
+        - BEAKER_keycloak_full: yes
     - set: centos-7
       collection: puppet5
       extra_envs:
         - BEAKER_keycloak_version: 7.0.0
+        - BEAKER_keycloak_full: yes
     - set: centos-7
       collection: puppet6
+      extra_envs:
+        - BEAKER_keycloak_full: yes
     - set: centos-7
       collection: puppet6
       extra_envs:
         - BEAKER_keycloak_version: 7.0.0
+        - BEAKER_keycloak_full: yes
     - set: debian-9
       collection: puppet5
     - set: debian-9
@@ -40,6 +46,18 @@
       collection: puppet6
       extra_envs:
         - BEAKER_keycloak_version: 7.0.0
+    - set: ubuntu-1804
+      collection: puppet5
+    - set: ubuntu-1804
+      collection: puppet5
+      extra_envs:
+        - BEAKER_keycloak_version: 7.0.0
+    - set: ubuntu-1804
+      collection: puppet6
+    - set: ubuntu-1804
+      collection: puppet6
+      extra_envs:
+        - BEAKER_keycloak_version: 7.0.0
   user: treydock
   secure: "u4N3WOhiO4X0mmEF7I+ARGpcw4Wrmt1xA8cmG2Qlnvr+r3c7RgWfc6GoabLicGKoN/OqVPD1b6lXJ+Xrg8VAJb9NmFjXYkowbTYgyyPsx6fSIshaquThkrEUsaF1C5hWx1rADXCz8hkpvX537xye/uKQlvDjwHyHaJWu3rpCfsDApYwYZhIkKtsSk2hOlcX9jfI1LE/H6YYo44uRBxg2lyUusScJQcDe023mBYOOSet3C4w4UpPBqR0mu9XvjJHk0KJzBE2Jk6g7W+02/ZkVW9qDXh70mCE562uQN/CE8rjcM5V1M6L69YzG5rv0LSuV4rnrjNtkNz6GZPDKIpuwOLEkA0M+jBr+F2d4tPHyMVDGLQHIIl5/TxXU2A9+gDe9yZFeZ7KEOSkkYfEgKgHcPHMZQJhs7Xkj2ab+F3AFjrSbjWngX892NQXp9XK4EXBZzogdsEp+wHULc9ybb9BKUNS0FIbCOjJoqBuwe7Is8vfVQ+OXAxVnP1POEoAgmgD3gQVHtedBAYrT7Ge+uxILua+KaPYkxBh/Cg9TYYSJeO/y0LH8pV3zSOQ3oU3MGZRbZrLbNkFAq9sYu3Klw52NEgfgXNRaE5AIpC0Tjf/BHZuaGGPyZML4A14tctwzFCFmG8SXkN2fFtpS5LAfLzbizi2KecPMyEjSpHJATJ/6HuQ="
 .gitlab-ci.yml:
@@ -57,4 +75,5 @@ spec/acceptance/nodesets/ubuntu-1404.yml:
 spec/acceptance/nodesets/ubuntu-1604.yml:
   delete: true
 spec/acceptance/nodesets/ubuntu-1804.yml:
-  delete: true
+  packages:
+    - iproute2
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
     -
       bundler_args: --with system_tests
       dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=centos-7 BEAKER_TESTMODE=apply
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_full=true
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
@@ -35,7 +35,7 @@ matrix:
     -
       bundler_args: --with system_tests
       dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_version=7.0.0
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_version=7.0.0 BEAKER_keycloak_full=true
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
@@ -44,7 +44,7 @@ matrix:
     -
       bundler_args: --with system_tests
       dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos-7 BEAKER_TESTMODE=apply
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_full=true
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
@@ -53,7 +53,7 @@ matrix:
     -
       bundler_args: --with system_tests
       dist: xenial
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_version=7.0.0
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_version=7.0.0 BEAKER_keycloak_full=true
       rvm: 2.5.3
       script: bundle exec rake beaker
       services: docker
@@ -95,6 +95,42 @@ matrix:
       services: docker
       stage: acceptance
       sudo: required
+    -
+      bundler_args: --with system_tests
+      dist: xenial
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=ubuntu-1804 BEAKER_TESTMODE=apply
+      rvm: 2.5.3
+      script: bundle exec rake beaker
+      services: docker
+      stage: acceptance
+      sudo: required
+    -
+      bundler_args: --with system_tests
+      dist: xenial
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=ubuntu-1804 BEAKER_TESTMODE=apply BEAKER_keycloak_version=7.0.0
+      rvm: 2.5.3
+      script: bundle exec rake beaker
+      services: docker
+      stage: acceptance
+      sudo: required
+    -
+      bundler_args: --with system_tests
+      dist: xenial
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=ubuntu-1804 BEAKER_TESTMODE=apply
+      rvm: 2.5.3
+      script: bundle exec rake beaker
+      services: docker
+      stage: acceptance
+      sudo: required
+    -
+      bundler_args: --with system_tests
+      dist: xenial
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=ubuntu-1804 BEAKER_TESTMODE=apply BEAKER_keycloak_version=7.0.0
+      rvm: 2.5.3
+      script: bundle exec rake beaker
+      services: docker
+      stage: acceptance
+      sudo: required
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static

diff --git a/README.md b/README.md
@@ -302,5 +302,6 @@ The path for `install_base` will be joined with `bin/kcadm.sh` to produce the fu
 This module has been tested on:
 
 * CentOS 7 x86_64
-* Debian 9 x86_64
 * RedHat 7 x86_64
+* Debian 9 x86_64
+* Ubuntu 18.04 x86_64
diff --git a/metadata.json b/metadata.json
@@ -18,11 +18,11 @@
     },
     {
       "name": "puppetlabs/postgresql",
-      "version_requirement": ">= 5.0.0 <7.0.0"
+      "version_requirement": ">= 5.7.0 <7.0.0"
     },
     {
       "name": "puppetlabs/java",
-      "version_requirement": ">= 2.2.0 <6.0.0"
+      "version_requirement": ">= 3.0.0 <6.0.0"
     },
     {
       "name": "puppetlabs/java_ks",
@@ -61,6 +61,12 @@
       "operatingsystemrelease": [
         "9"
       ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "18.04"
+      ]
     }
   ],
   "requirements": [

diff --git a/spec/acceptance/2_realm_spec.rb b/spec/acceptance/2_realm_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak_realm:' do
+describe 'keycloak_realm:', if: RSpec.configuration.keycloak_full do
   context 'creates realm' do
     it 'runs successfully' do
       pp = <<-EOS

diff --git a/spec/acceptance/3_ldap_spec.rb b/spec/acceptance/3_ldap_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak_ldap_user_provider:' do
+describe 'keycloak_ldap_user_provider:', if: RSpec.configuration.keycloak_full do
   context 'creates ldap' do
     it 'runs successfully' do
       pp = <<-EOS

diff --git a/spec/acceptance/3_sssd_spec.rb b/spec/acceptance/3_sssd_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak_sssd_user_provider:' do
+describe 'keycloak_sssd_user_provider:', if: RSpec.configuration.keycloak_full do
   context 'bootstrap sssd' do
     it 'is successful' do
       on hosts, 'puppet resource package sssd-dbus ensure=installed'

diff --git a/spec/acceptance/4_client_scopes_spec.rb b/spec/acceptance/4_client_scopes_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak client scopes defines:' do
+describe 'keycloak client scopes defines:', if: RSpec.configuration.keycloak_full do
   context 'creates client scopes' do
     it 'runs successfully' do
       pp = <<-EOS

diff --git a/spec/acceptance/5_client_spec.rb b/spec/acceptance/5_client_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak_client define:' do
+describe 'keycloak_client define:', if: RSpec.configuration.keycloak_full do
   context 'creates client' do
     it 'runs successfully' do
       pp = <<-EOS

diff --git a/spec/acceptance/6_protocol_mapper_spec.rb b/spec/acceptance/6_protocol_mapper_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak_protocol_mapper type:' do
+describe 'keycloak_protocol_mapper type:', if: RSpec.configuration.keycloak_full do
   context 'creates protocol_mapper' do
     it 'runs successfully' do
       pp = <<-EOS

diff --git a/spec/acceptance/7_client_protocol_mapper_spec.rb b/spec/acceptance/7_client_protocol_mapper_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak_client_protocol_mapper type:' do
+describe 'keycloak_client_protocol_mapper type:', if: RSpec.configuration.keycloak_full do
   context 'creates protocol_mapper' do
     it 'runs successfully' do
       pp = <<-EOS

diff --git a/spec/acceptance/8_identity_provider_spec.rb b/spec/acceptance/8_identity_provider_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak_identity_provider type:' do
+describe 'keycloak_identity_provider type:', if: RSpec.configuration.keycloak_full do
   context 'creates identity provider' do
     it 'runs successfully' do
       pp = <<-EOS

diff --git a/spec/acceptance/99_keycloak_api_spec.rb b/spec/acceptance/99_keycloak_api_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'keycloak_api:' do
+describe 'keycloak_api:', if: RSpec.configuration.keycloak_full do
   context 'bootstraps' do
     it 'runs successfully' do
       pp = <<-EOS

diff --git a/spec/acceptance/nodesets/ubuntu-1804.yml b/spec/acceptance/nodesets/ubuntu-1804.yml
@@ -0,0 +1,21 @@
+HOSTS:
+  ubuntu1804:
+    roles:
+      - agent
+    platform: ubuntu-18.04-amd64
+    hypervisor : docker
+    image: ubuntu:18.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
+      - 'apt-get install -y wget net-tools locales iproute2'
+      - 'locale-gen en_US.UTF-8'
+    docker_container_name: 'keycloak-ubuntu1804'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+
diff --git a/spec/spec_helper_acceptance_setup.rb b/spec/spec_helper_acceptance_setup.rb
@@ -1,6 +1,8 @@
 RSpec.configure do |c|
   c.add_setting :keycloak_version
   c.keycloak_version = (ENV['BEAKER_keycloak_version'] || '6.0.1')
+  c.add_setting :keycloak_full
+  c.keycloak_full = (ENV['BEAKER_keycloak_full'] == 'true' || ENV['BEAKER_keycloak_full'] == 'yes')
 end
 
 hiera_yaml = <<-EOS