diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f005b1c74c23dfe41c9b5808e1ccb97c8c7aef4d..572181adcd78c1271f0bfb5079c865da2518c046 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,13 +28,6 @@ validate lint check rubocop-Ruby 2.7.5-Puppet ~> 7: - bundle exec rake validate lint check rubocop variables: PUPPET_GEM_VERSION: "~> 7" -parallel_spec-Ruby 2.7.5-Puppet ~> 6: - stage: unit - image: ruby:2.7.5 - script: - - bundle exec rake parallel_spec - variables: - PUPPET_GEM_VERSION: "~> 6" parallel_spec-Ruby 2.7.5-Puppet ~> 7: stage: unit image: ruby:2.7.5 @@ -42,22 +35,6 @@ parallel_spec-Ruby 2.7.5-Puppet ~> 7: - bundle exec rake parallel_spec variables: PUPPET_GEM_VERSION: "~> 7" -acceptance with puppet6 ubuntu2004: - needs: - - parallel_spec-Ruby 2.7.5-Puppet ~> 6 - stage: acceptance - variables: - RBENV_VERSION: 2.7.5 - PUPPET_INSTALL_TYPE: agent - BEAKER_IS_PE: 'no' - BEAKER_PUPPET_COLLECTION: puppet6 - BEAKER_debug: 'true' - BEAKER_setfile: ubuntu2004-64 - BEAKER_HYPERVISOR: docker - script: - - bundle exec rake beaker - tags: - - puppet-tests acceptance with puppet7 ubuntu2004: needs: - parallel_spec-Ruby 2.7.5-Puppet ~> 7 @@ -74,22 +51,6 @@ acceptance with puppet7 ubuntu2004: - bundle exec rake beaker tags: - puppet-tests -acceptance with puppet6 ubuntu2204: - needs: - - parallel_spec-Ruby 2.7.5-Puppet ~> 6 - stage: acceptance - variables: - RBENV_VERSION: 2.7.5 - PUPPET_INSTALL_TYPE: agent - BEAKER_IS_PE: 'no' - BEAKER_PUPPET_COLLECTION: puppet6 - BEAKER_debug: 'true' - BEAKER_setfile: ubuntu2204-64 - BEAKER_HYPERVISOR: docker - script: - - bundle exec rake beaker - tags: - - puppet-tests acceptance with puppet7 ubuntu2204: needs: - parallel_spec-Ruby 2.7.5-Puppet ~> 7 diff --git a/.sync.yml b/.sync.yml index 54f5a9dc4e0e2ff822f7e1a4d89a2d5cdb830761..4fa29d6b5d17f7f3ac63c5bb1675c89824454566 100644 --- a/.sync.yml +++ b/.sync.yml @@ -29,13 +29,6 @@ appveyor.yml: - bundle exec rake validate lint check rubocop variables: PUPPET_GEM_VERSION: '~> 7' - parallel_spec-Ruby 2.7.5-Puppet ~> 6: - stage: unit - image: ruby:2.7.5 - script: - - bundle exec rake parallel_spec - variables: - PUPPET_GEM_VERSION: '~> 6' parallel_spec-Ruby 2.7.5-Puppet ~> 7: stage: unit image: ruby:2.7.5 @@ -44,22 +37,6 @@ appveyor.yml: variables: PUPPET_GEM_VERSION: '~> 7' - acceptance with puppet6 ubuntu2004: - needs: - - parallel_spec-Ruby 2.7.5-Puppet ~> 6 - stage: acceptance - variables: - RBENV_VERSION: '2.7.5' - PUPPET_INSTALL_TYPE: 'agent' - BEAKER_IS_PE: 'no' - BEAKER_PUPPET_COLLECTION: 'puppet6' - BEAKER_debug: 'true' - BEAKER_setfile: 'ubuntu2004-64' - BEAKER_HYPERVISOR: 'docker' - script: - - bundle exec rake beaker - tags: - - puppet-tests acceptance with puppet7 ubuntu2004: needs: - parallel_spec-Ruby 2.7.5-Puppet ~> 7 @@ -76,22 +53,6 @@ appveyor.yml: - bundle exec rake beaker tags: - puppet-tests - acceptance with puppet6 ubuntu2204: - needs: - - parallel_spec-Ruby 2.7.5-Puppet ~> 6 - stage: acceptance - variables: - RBENV_VERSION: '2.7.5' - PUPPET_INSTALL_TYPE: 'agent' - BEAKER_IS_PE: 'no' - BEAKER_PUPPET_COLLECTION: 'puppet6' - BEAKER_debug: 'true' - BEAKER_setfile: 'ubuntu2204-64' - BEAKER_HYPERVISOR: 'docker' - script: - - bundle exec rake beaker - tags: - - puppet-tests acceptance with puppet7 ubuntu2204: needs: - parallel_spec-Ruby 2.7.5-Puppet ~> 7 diff --git a/metadata.json b/metadata.json index 8ba0c623451437506bea83228b86a7864f2e159d..feb32b9049224a459c225d9ba33017208b03cacc 100644 --- a/metadata.json +++ b/metadata.json @@ -37,7 +37,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.21.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 8.0.0" } ], "tags": [