diff --git a/.fixtures.yml b/.fixtures.yml index 7cfde05..636327a 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,37 +1,37 @@ fixtures: repositories: stdlib: repo: https://github.com/puppetlabs/puppetlabs-stdlib.git ref: 4.25.0 mysql: repo: https://github.com/puppetlabs/puppetlabs-mysql.git ref: v10.3.0 postgresql: repo: https://github.com/puppetlabs/puppetlabs-postgresql.git ref: v6.6.0 java: repo: https://github.com/puppetlabs/puppetlabs-java.git - ref: v6.3.0 + ref: v7.3.0 java_ks: repo: https://github.com/puppetlabs/puppetlabs-java_ks.git ref: 1.4.1 archive: repo: https://github.com/voxpupuli/puppet-archive.git ref: v0.5.1 systemd: repo: https://github.com/camptocamp/puppet-systemd.git ref: 0.4.0 augeas_core: repo: https://github.com/puppetlabs/puppetlabs-augeas_core.git puppet_version: ">= 6.0.0" ref: 1.1.1 yumrepo_core: repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git puppet_version: ">= 6.0.0" ref: 1.0.7 apt: repo: https://github.com/puppetlabs/puppetlabs-apt.git concat: repo: https://github.com/puppetlabs/puppetlabs-concat.git symlinks: keycloak: "#{source_dir}" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 11c9aac..73f5afd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,143 +1,143 @@ name: CI on: push: branches: - main - master pull_request: jobs: unit: runs-on: ubuntu-latest continue-on-error: ${{ matrix.allow_failure }} strategy: fail-fast: false matrix: include: - ruby: 2.5.7 puppet: 6 fixtures: .fixtures.yml allow_failure: false - ruby: 2.7.0 puppet: 7 fixtures: .fixtures.yml allow_failure: false - ruby: 2.5.7 puppet: 6 fixtures: .fixtures-latest.yml allow_failure: true - ruby: 2.7.0 puppet: 7 fixtures: .fixtures-latest.yml allow_failure: true env: BUNDLE_WITHOUT: system_tests:release PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}.0" FACTER_GEM_VERSION: "< 4.0" FIXTURES_YML: ${{ matrix.fixtures }} name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }}) steps: - uses: actions/checkout@v2 - name: Setup ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} bundler-cache: true bundler: '2.1.0' - name: Validate run: bundle exec rake check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint - name: Run tests run: bundle exec rake parallel_spec acceptance: runs-on: ubuntu-latest strategy: fail-fast: false matrix: set: - "centos-7" - - "centos-8" + - "rocky-8" - "debian-9" - "debian-10" - "ubuntu-1804" - "ubuntu-2004" puppet: - "puppet6" - "puppet7" keycloak_version: - "12.0.4" - "13.0.1" - "14.0.0" - "15.0.1" keycloak_full: - "no" keycloak_domain_mode_cluster: - "no" include: - set: "centos-7" puppet: "puppet6" keycloak_version: "12.0.4" keycloak_full: "yes" - set: "centos-7" puppet: "puppet7" keycloak_version: "12.0.4" keycloak_full: "yes" - set: "centos-7" puppet: "puppet7" keycloak_version: "13.0.1" keycloak_full: "yes" - set: "centos-7" puppet: "puppet7" keycloak_version: "14.0.0" keycloak_full: "yes" - set: "centos-7" puppet: "puppet7" keycloak_version: "15.0.1" keycloak_full: "yes" - set: "centos-7-domain-mode-cluster" puppet: "puppet7" keycloak_version: "12.0.4" keycloak_domain_mode_cluster: "yes" - set: "centos-7-domain-mode-cluster" puppet: "puppet7" keycloak_version: "13.0.1" keycloak_domain_mode_cluster: "yes" - set: "centos-7-domain-mode-cluster" puppet: "puppet7" keycloak_version: "14.0.0" keycloak_domain_mode_cluster: "yes" - set: "centos-7-domain-mode-cluster" puppet: "puppet7" keycloak_version: "15.0.1" keycloak_domain_mode_cluster: "yes" env: BUNDLE_WITHOUT: development:release BEAKER_debug: true name: ${{ matrix.puppet }} ${{ matrix.set }} (keycloak=${{ matrix.keycloak_version }} full=${{ matrix.keycloak_full }}) steps: - name: Enable IPv6 on docker run: | echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json sudo service docker restart # https://github.com/actions/virtual-environments/issues/181#issuecomment-610874237 - name: apparmor run: | set -x sudo apt-get remove mysql-server --purge sudo apt-get install apparmor-profiles sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld - uses: actions/checkout@v2 - name: Setup ruby uses: ruby/setup-ruby@v1 with: ruby-version: '2.7' bundler-cache: true bundler: '2.1.0' - name: Run tests run: bundle exec rake beaker env: BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet }} BEAKER_set: ${{ matrix.set }} BEAKER_keycloak_version: ${{ matrix.keycloak_version }} BEAKER_keycloak_full: ${{ matrix.keycloak_full }} BEAKER_keycloak_domain_mode_cluster: ${{ matrix.keycloak_domain_mode_cluster }} diff --git a/.sync.yml b/.sync.yml index 219b3ec..e5d5df4 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,93 +1,85 @@ --- .github/workflows/ci.yaml: unit_name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }}) unit_includes: - ruby: '2.5.7' puppet: '6' fixtures: .fixtures-latest.yml allow_failure: true - ruby: '2.7.0' puppet: '7' fixtures: .fixtures-latest.yml allow_failure: true acceptance_name: '${{ matrix.puppet }} ${{ matrix.set }} (keycloak=${{ matrix.keycloak_version }} full=${{ matrix.keycloak_full }})' acceptance_matrix: set: - centos-7 - - centos-8 + - rocky-8 - debian-9 - debian-10 - ubuntu-1804 - ubuntu-2004 puppet: - puppet6 - puppet7 keycloak_version: - '12.0.4' - '13.0.1' - '14.0.0' - '15.0.1' keycloak_full: ['no'] keycloak_domain_mode_cluster: ['no'] acceptance_includes: - set: centos-7 puppet: puppet6 keycloak_version: 12.0.4 keycloak_full: 'yes' - set: centos-7 puppet: puppet7 keycloak_version: 12.0.4 keycloak_full: 'yes' - set: centos-7 puppet: puppet7 keycloak_version: 13.0.1 keycloak_full: 'yes' - set: centos-7 puppet: puppet7 keycloak_version: 14.0.0 keycloak_full: 'yes' - set: centos-7 puppet: puppet7 keycloak_version: 15.0.1 keycloak_full: 'yes' - set: centos-7-domain-mode-cluster puppet: puppet7 keycloak_version: 12.0.4 keycloak_domain_mode_cluster: 'yes' - set: centos-7-domain-mode-cluster puppet: puppet7 keycloak_version: 13.0.1 keycloak_domain_mode_cluster: 'yes' - set: centos-7-domain-mode-cluster puppet: puppet7 keycloak_version: 14.0.0 keycloak_domain_mode_cluster: 'yes' - set: centos-7-domain-mode-cluster puppet: puppet7 keycloak_version: 15.0.1 keycloak_domain_mode_cluster: 'yes' .gitignore: paths: - /vagrant/.vagrant/ - /vagrant/*.log .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 spec/acceptance/nodesets/ubuntu-2004.yml: packages: - iproute2 diff --git a/metadata.json b/metadata.json index f1cc772..4426844 100644 --- a/metadata.json +++ b/metadata.json @@ -1,87 +1,92 @@ { "name": "treydock-keycloak", "version": "7.10.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 <8.0.0" }, { "name": "puppetlabs/mysql", "version_requirement": ">= 10.3.0 <12.0.0" }, { "name": "puppetlabs/postgresql", "version_requirement": ">= 6.6.0 <8.0.0" }, { "name": "puppetlabs/java", - "version_requirement": ">= 6.3.0 <8.0.0" + "version_requirement": ">= 7.3.0 <8.0.0" }, { "name": "puppetlabs/java_ks", "version_requirement": ">= 1.0.0 <5.0.0" }, { "name": "puppetlabs/augeas_core", "version_requirement": ">= 1.0.0 <2.0.0" }, { "name": "puppetlabs/yumrepo_core", "version_requirement": ">= 1.0.0 <2.0.0" }, { "name": "puppet/archive", "version_requirement": ">= 0.5.1 <6.0.0" }, { "name": "camptocamp/systemd", "version_requirement": ">= 0.4.0 <4.0.0" } ], "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", "8" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ - "7", + "7" + ] + }, + { + "operatingsystem": "Rocky", + "operatingsystemrelease": [ "8" ] }, { "operatingsystem": "Debian", "operatingsystemrelease": [ "9", "10" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "18.04", "20.04" ] } ], "requirements": [ { "name": "puppet", "version_requirement": ">= 6.0.0 < 8.0.0" } ], "pdk-version": "1.17.0", "template-url": "https://github.com/treydock/pdk-templates.git#master", - "template-ref": "heads/master-0-g4e040ab" + "template-ref": "heads/master-0-g3b13f94" } diff --git a/spec/acceptance/nodesets/centos-8.yml b/spec/acceptance/nodesets/rocky-8.yml similarity index 92% rename from spec/acceptance/nodesets/centos-8.yml rename to spec/acceptance/nodesets/rocky-8.yml index 41e74e9..2ef1a1b 100644 --- a/spec/acceptance/nodesets/centos-8.yml +++ b/spec/acceptance/nodesets/rocky-8.yml @@ -1,26 +1,26 @@ HOSTS: - centos-8: + rocky-8: roles: - agent platform: el-8-x86_64 hypervisor: docker - image: centos:8 + image: rockylinux/rockylinux:8 docker_preserve_image: true docker_cmd: - '/usr/sbin/init' docker_image_commands: - 'dnf install -y dnf-utils' - 'dnf config-manager --set-enabled powertools' - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks' docker_env: - LANG=en_US.UTF-8 - LANGUAGE=en_US.UTF-8 - LC_ALL=en_US.UTF-8 docker_container_name: 'keycloak-el8' 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 7e42ee9..898348b 100644 --- a/spec/acceptance/nodesets/ubuntu-1804.yml +++ b/spec/acceptance/nodesets/ubuntu-1804.yml @@ -1,25 +1,25 @@ 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 apt-transport-https ca-certificates iproute2' + - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates' - 'locale-gen en_US.UTF-8' docker_env: - LANG=en_US.UTF-8 - LANGUAGE=en_US.UTF-8 - LC_ALL=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/acceptance/nodesets/ubuntu-2004.yml b/spec/acceptance/nodesets/ubuntu-2004.yml index 346a6a3..8a020f8 100644 --- a/spec/acceptance/nodesets/ubuntu-2004.yml +++ b/spec/acceptance/nodesets/ubuntu-2004.yml @@ -1,25 +1,25 @@ HOSTS: ubuntu2004: roles: - agent platform: ubuntu-20.04-amd64 hypervisor : docker image: ubuntu:20.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 apt-transport-https ca-certificates iproute2' + - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates' - 'locale-gen en_US.UTF-8' docker_env: - LANG=en_US.UTF-8 - LANGUAGE=en_US.UTF-8 - LC_ALL=en_US.UTF-8 docker_container_name: 'keycloak-ubuntu2004' CONFIG: log_level: debug type: foss ssh: password: root auth_methods: ["password"]