diff --git a/.sync.yml b/.sync.yml index 524b1938..ee9536ed 100644 --- a/.sync.yml +++ b/.sync.yml @@ -20,68 +20,68 @@ 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: diff --git a/.travis.yml b/.travis.yml index 17ad5d63..327cfb7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,15 @@ 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=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 @@ -41,6 +50,15 @@ 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=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 @@ -50,6 +68,15 @@ 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=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 @@ -59,6 +86,15 @@ 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=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 @@ -68,6 +104,15 @@ 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=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 @@ -77,6 +122,15 @@ 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=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 @@ -86,6 +140,15 @@ 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=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 @@ -95,6 +158,15 @@ 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=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 @@ -104,6 +176,15 @@ 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 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 @@ -113,6 +194,15 @@ 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=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 diff --git a/metadata.json b/metadata.json index b15af9fb..67405a82 100644 --- a/metadata.json +++ b/metadata.json @@ -79,7 +79,7 @@ "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 cad804be..91b3b84f 100644 --- a/spec/acceptance/nodesets/debian-10.yml +++ b/spec/acceptance/nodesets/debian-10.yml @@ -9,7 +9,7 @@ HOSTS: 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' diff --git a/spec/acceptance/nodesets/debian-9.yml b/spec/acceptance/nodesets/debian-9.yml index 559976e4..7987c696 100644 --- a/spec/acceptance/nodesets/debian-9.yml +++ b/spec/acceptance/nodesets/debian-9.yml @@ -9,7 +9,7 @@ HOSTS: 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' diff --git a/spec/acceptance/nodesets/ubuntu-1804.yml b/spec/acceptance/nodesets/ubuntu-1804.yml index 0f385e92..c90273ea 100644 --- a/spec/acceptance/nodesets/ubuntu-1804.yml +++ b/spec/acceptance/nodesets/ubuntu-1804.yml @@ -9,7 +9,7 @@ HOSTS: 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: