diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index caf39601..fc5393a5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -66,6 +66,7 @@ jobs: - "puppet7" keycloak_version: - "12.0.4" + - "13.0.1" keycloak_full: - "no" keycloak_domain_mode_cluster: @@ -79,6 +80,14 @@ jobs: puppet: "puppet7" keycloak_version: "12.0.4" keycloak_full: "yes" + - set: "centos-7" + puppet: "puppet6" + keycloak_version: "13.0.1" + keycloak_full: "yes" + - set: "centos-7" + puppet: "puppet7" + keycloak_version: "13.0.1" + keycloak_full: "yes" - set: "centos-7-domain-mode-cluster" puppet: "puppet6" keycloak_version: "12.0.4" @@ -87,6 +96,14 @@ jobs: puppet: "puppet7" keycloak_version: "12.0.4" keycloak_domain_mode_cluster: "yes" + - set: "centos-7-domain-mode-cluster" + puppet: "puppet6" + keycloak_version: "13.0.1" + keycloak_domain_mode_cluster: "yes" + - set: "centos-7-domain-mode-cluster" + puppet: "puppet7" + keycloak_version: "13.0.1" + keycloak_domain_mode_cluster: "yes" env: BUNDLE_WITHOUT: development:release BEAKER_debug: true diff --git a/.sync.yml b/.sync.yml index 09450584..0ae275a1 100644 --- a/.sync.yml +++ b/.sync.yml @@ -24,6 +24,7 @@ - puppet7 keycloak_version: - '12.0.4' + - '13.0.1' keycloak_full: ['no'] keycloak_domain_mode_cluster: ['no'] acceptance_includes: @@ -35,6 +36,14 @@ puppet: puppet7 keycloak_version: 12.0.4 keycloak_full: 'yes' + - set: centos-7 + puppet: puppet6 + keycloak_version: 13.0.1 + keycloak_full: 'yes' + - set: centos-7 + puppet: puppet7 + keycloak_version: 13.0.1 + keycloak_full: 'yes' - set: centos-7-domain-mode-cluster puppet: puppet6 keycloak_version: 12.0.4 @@ -43,6 +52,14 @@ puppet: puppet7 keycloak_version: 12.0.4 keycloak_domain_mode_cluster: 'yes' + - set: centos-7-domain-mode-cluster + puppet: puppet6 + keycloak_version: 13.0.1 + keycloak_domain_mode_cluster: 'yes' + - set: centos-7-domain-mode-cluster + puppet: puppet7 + keycloak_version: 13.0.1 + keycloak_domain_mode_cluster: 'yes' .gitignore: paths: - /vagrant/.vagrant/ diff --git a/Gemfile b/Gemfile index 3b7e71d8..2f01d841 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ group :system_tests do gem "beaker-pe", require: false gem "beaker-hostgenerator" gem "beaker-rspec" - gem "beaker-docker" + gem "beaker-docker", *location_for(ENV['BEAKER_DOCKER_VERSION'] || '~> 0.7.0') gem "beaker-puppet" end diff --git a/README.md b/README.md index 6f47cb64..a23577d1 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ This module may work on earlier versions but this is the only version tested. | 4.x - 6.x | 3.x | | 6.x - 8.x | 4.x - 5.x | | 8.x - 12.x | 6.x | -| 12.x | 7.x | +| 12.x - 13.x | 7.x | ## Usage diff --git a/metadata.json b/metadata.json index 86e13163..e02c77b3 100644 --- a/metadata.json +++ b/metadata.json @@ -90,5 +90,5 @@ ], "pdk-version": "1.17.0", "template-url": "https://github.com/treydock/pdk-templates.git#master", - "template-ref": "heads/master-0-gc21ae9d" + "template-ref": "heads/master-0-g3ae711a" }