From 8f65746c2b3e2616a70dd900124de6de8ebc2f65 Mon Sep 17 00:00:00 2001
From: Fabien COMBERNOUS <fabien.combernous@adullact.org>
Date: Mon, 1 Jul 2024 15:16:12 +0200
Subject: [PATCH] set lower limit for puppet version_requirement to 7.0.0
---
.gitlab-ci.yml | 39 ---------------------------------------
.sync.yml | 39 ---------------------------------------
metadata.json | 2 +-
3 files changed, 1 insertion(+), 79 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f005b1c..572181a 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 54f5a9d..4fa29d6 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 8ba0c62..feb32b9 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": [
--
GitLab