diff --git a/.sync.yml b/.sync.yml index 524b193..ee9536e 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,104 +1,104 @@ --- .travis.yml: dist: xenial extras: - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml" rvm: 2.4.5 stage: spec - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml" rvm: 2.5.3 stage: spec allow_failures: - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml" rvm: 2.4.5 - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml" rvm: 2.5.3 docker_defaults: dist: xenial 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: puppet5 + extra_envs: + - BEAKER_keycloak_version: 9.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: 9.0.0 - BEAKER_keycloak_full: yes -# - set: centos-7 -# collection: puppet6 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 -# - BEAKER_keycloak_full: yes - set: centos-8 collection: puppet5 -# - set: centos-8 -# collection: puppet5 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 + - set: centos-8 + collection: puppet5 + extra_envs: + - BEAKER_keycloak_version: 9.0.0 + - set: centos-8 + collection: puppet6 - set: centos-8 collection: puppet6 -# - set: centos-8 -# collection: puppet6 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 + extra_envs: + - BEAKER_keycloak_version: 9.0.0 + - set: debian-9 + collection: puppet5 - set: debian-9 collection: puppet5 -# - set: debian-9 -# collection: puppet5 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 + extra_envs: + - BEAKER_keycloak_version: 9.0.0 + - set: debian-9 + collection: puppet6 - set: debian-9 collection: puppet6 -# - set: debian-9 -# collection: puppet6 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 + extra_envs: + - BEAKER_keycloak_version: 9.0.0 - set: debian-10 collection: puppet5 -# - set: debian-10 -# collection: puppet5 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 + - set: debian-10 + collection: puppet5 + extra_envs: + - BEAKER_keycloak_version: 9.0.0 + - set: debian-10 + collection: puppet6 - set: debian-10 collection: puppet6 -# - set: debian-10 -# collection: puppet6 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 + extra_envs: + - BEAKER_keycloak_version: 9.0.0 + - set: ubuntu-1804 + collection: puppet5 - set: ubuntu-1804 collection: puppet5 -# - set: ubuntu-1804 -# collection: puppet5 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 + extra_envs: + - BEAKER_keycloak_version: 9.0.0 + - set: ubuntu-1804 + collection: puppet6 - set: ubuntu-1804 collection: puppet6 -# - set: ubuntu-1804 -# collection: puppet6 -# extra_envs: -# - BEAKER_keycloak_version: 7.0.0 + extra_envs: + - BEAKER_keycloak_version: 9.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: delete: true appveyor.yml: delete: true spec/acceptance/nodesets/centos-6.yml: delete: true spec/acceptance/nodesets/debian-8.yml: delete: true spec/acceptance/nodesets/debian-10.yml: packages: - iproute2 spec/acceptance/nodesets/ubuntu-1404.yml: delete: true spec/acceptance/nodesets/ubuntu-1604.yml: delete: true spec/acceptance/nodesets/ubuntu-1804.yml: packages: - iproute2 diff --git a/.travis.yml b/.travis.yml index 17ad5d6..327cfb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,159 +1,249 @@ --- dist: xenial language: ruby cache: bundler before_install: - bundle -v - rm -f Gemfile.lock - gem update --system $RUBYGEMS_VERSION - gem --version - bundle -v script: - 'bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - 2.5.3 stages: - static - spec - acceptance - if: tag =~ ^v\d name: deploy matrix: fast_finish: true include: - 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_full=true 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=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_version=9.0.0 BEAKER_keycloak_full=true + 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=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_full=true 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=centos-7 BEAKER_TESTMODE=apply BEAKER_keycloak_version=9.0.0 BEAKER_keycloak_full=true + 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=centos-8 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=centos-8 BEAKER_TESTMODE=apply BEAKER_keycloak_version=9.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=centos-8 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=centos-8 BEAKER_TESTMODE=apply BEAKER_keycloak_version=9.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=puppet5 BEAKER_set=debian-9 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=debian-9 BEAKER_TESTMODE=apply BEAKER_keycloak_version=9.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=debian-9 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=debian-9 BEAKER_TESTMODE=apply BEAKER_keycloak_version=9.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=puppet5 BEAKER_set=debian-10 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=debian-10 BEAKER_TESTMODE=apply BEAKER_keycloak_version=9.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=debian-10 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=debian-10 BEAKER_TESTMODE=apply BEAKER_keycloak_version=9.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=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=9.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=9.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 - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec rvm: 2.4.5 stage: spec - env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec rvm: 2.5.3 stage: spec - env: DEPLOY_TO_FORGE=yes stage: deploy - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml" rvm: 2.4.5 stage: spec - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml" rvm: 2.5.3 stage: spec allow_failures: - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml" rvm: 2.4.5 - env: CHECK="parallel_spec" PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml" rvm: 2.5.3 branches: only: - master - /^v\d/ notifications: email: treydock@gmail.com deploy: provider: puppetforge user: treydock password: secure: "u4N3WOhiO4X0mmEF7I+ARGpcw4Wrmt1xA8cmG2Qlnvr+r3c7RgWfc6GoabLicGKoN/OqVPD1b6lXJ+Xrg8VAJb9NmFjXYkowbTYgyyPsx6fSIshaquThkrEUsaF1C5hWx1rADXCz8hkpvX537xye/uKQlvDjwHyHaJWu3rpCfsDApYwYZhIkKtsSk2hOlcX9jfI1LE/H6YYo44uRBxg2lyUusScJQcDe023mBYOOSet3C4w4UpPBqR0mu9XvjJHk0KJzBE2Jk6g7W+02/ZkVW9qDXh70mCE562uQN/CE8rjcM5V1M6L69YzG5rv0LSuV4rnrjNtkNz6GZPDKIpuwOLEkA0M+jBr+F2d4tPHyMVDGLQHIIl5/TxXU2A9+gDe9yZFeZ7KEOSkkYfEgKgHcPHMZQJhs7Xkj2ab+F3AFjrSbjWngX892NQXp9XK4EXBZzogdsEp+wHULc9ybb9BKUNS0FIbCOjJoqBuwe7Is8vfVQ+OXAxVnP1POEoAgmgD3gQVHtedBAYrT7Ge+uxILua+KaPYkxBh/Cg9TYYSJeO/y0LH8pV3zSOQ3oU3MGZRbZrLbNkFAq9sYu3Klw52NEgfgXNRaE5AIpC0Tjf/BHZuaGGPyZML4A14tctwzFCFmG8SXkN2fFtpS5LAfLzbizi2KecPMyEjSpHJATJ/6HuQ=" on: tags: true all_branches: true condition: "$DEPLOY_TO_FORGE = yes" diff --git a/metadata.json b/metadata.json index b15af9f..67405a8 100644 --- a/metadata.json +++ b/metadata.json @@ -1,85 +1,85 @@ { "name": "treydock-keycloak", "version": "6.9.0", "author": "treydock", "summary": "Keycloak Puppet module", "license": "Apache-2.0", "source": "https://github.com/treydock/puppet-module-keycloak", "project_page": "https://github.com/treydock/puppet-module-keycloak", "issues_url": "https://github.com/treydock/puppet-module-keycloak/issues", "dependencies": [ { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.25.0 <7.0.0" }, { "name": "puppetlabs/mysql", "version_requirement": ">= 10.2.0 <11.0.0" }, { "name": "puppetlabs/postgresql", "version_requirement": ">= 6.2.0 <7.0.0" }, { "name": "puppetlabs/java", "version_requirement": ">= 5.0.0 <7.0.0" }, { "name": "puppetlabs/java_ks", "version_requirement": ">= 1.0.0 <4.0.0" }, { "name": "puppet/archive", "version_requirement": ">= 0.5.1 <5.0.0" }, { "name": "camptocamp/systemd", "version_requirement": ">= 0.4.0 <3.0.0" } ], "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", "8" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "7", "8" ] }, { "operatingsystem": "Scientific", "operatingsystemrelease": [ "7", "8" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "9", "10" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "18.04" ] } ], "requirements": [ { "name": "puppet", "version_requirement": ">= 5.0.0 < 7.0.0" } ], - "pdk-version": "1.14.1", + "pdk-version": "1.17.0", "template-url": "https://github.com/treydock/pdk-templates.git#master", - "template-ref": "heads/master-0-gaddf0b8" + "template-ref": "heads/master-0-gd71639e" } diff --git a/spec/acceptance/nodesets/debian-10.yml b/spec/acceptance/nodesets/debian-10.yml index cad804b..91b3b84 100644 --- a/spec/acceptance/nodesets/debian-10.yml +++ b/spec/acceptance/nodesets/debian-10.yml @@ -1,24 +1,24 @@ HOSTS: debian10: roles: - agent platform: debian-10-amd64 hypervisor: docker image: debian:10 docker_preserve_image: true docker_cmd: - '/sbin/init' docker_image_commands: - - 'apt-get install -y wget net-tools systemd-sysv locales iproute2' + - 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates iproute2' - 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment' - 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen' - 'echo "LANG=en_US.UTF-8" > /etc/locale.conf' - 'locale-gen en_US.UTF-8' docker_container_name: 'keycloak-debian10' CONFIG: log_level: debug type: foss ssh: password: root auth_methods: ["password"] diff --git a/spec/acceptance/nodesets/debian-9.yml b/spec/acceptance/nodesets/debian-9.yml index 559976e..7987c69 100644 --- a/spec/acceptance/nodesets/debian-9.yml +++ b/spec/acceptance/nodesets/debian-9.yml @@ -1,24 +1,24 @@ HOSTS: debian9: roles: - agent platform: debian-9-amd64 hypervisor: docker image: debian:9 docker_preserve_image: true docker_cmd: - '/sbin/init' docker_image_commands: - - 'apt-get install -y wget net-tools systemd-sysv locales' + - 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates' - 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment' - 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen' - 'echo "LANG=en_US.UTF-8" > /etc/locale.conf' - 'locale-gen en_US.UTF-8' docker_container_name: 'keycloak-debian9' CONFIG: log_level: debug type: foss ssh: password: root auth_methods: ["password"] diff --git a/spec/acceptance/nodesets/ubuntu-1804.yml b/spec/acceptance/nodesets/ubuntu-1804.yml index 0f385e9..c90273e 100644 --- a/spec/acceptance/nodesets/ubuntu-1804.yml +++ b/spec/acceptance/nodesets/ubuntu-1804.yml @@ -1,21 +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' + - 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates iproute2' - 'locale-gen en_US.UTF-8' docker_container_name: 'keycloak-ubuntu1804' CONFIG: log_level: debug type: foss ssh: password: root auth_methods: ["password"]