From 3d0fca864c88590170327cf745a16ccff795872e Mon Sep 17 00:00:00 2001
From: AI Config Rundeck <rundeck@cern.ch>
Date: Wed, 4 Jun 2025 07:09:42 +0200
Subject: [PATCH] Update from it-puppet-modulesync-configs 2.11.1
---
.gitattributes | 5 +++++
.gitlab-ci.yml | 8 ++++----
.msync.yml | 2 +-
Dockerfile | 2 +-
ci/Gemfile | 5 +++--
ci/boilerplate/spec/classes/init_spec.rb | 4 ++--
ci/boilerplate/spec/defines/mytype_spec.rb | 4 ++--
7 files changed, 18 insertions(+), 12 deletions(-)
create mode 100644 .gitattributes
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9032a01
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+*.rb eol=lf
+*.erb eol=lf
+*.pp eol=lf
+*.sh eol=lf
+*.epp eol=lf
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60feb1c..b1ba1da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,12 +30,12 @@ alma9-puppet-ci:
CONTEXT_DIR: .
DOCKER_FILE: ci/Dockerfile
FROM: gitlab-registry.cern.ch/linuxsupport/alma9-base
- TO: ${CI_REGISTRY_IMAGE}:alma9-puppet-ci-2.10.1
+ TO: ${CI_REGISTRY_IMAGE}:alma9-puppet-ci-2.11.1
.rake_template: &rake_template
stage: tests
- image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.10.1
+ image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.1
artifacts:
reports:
junit: code/rspec*.xml
@@ -81,7 +81,7 @@ rubocop:
yaml-validate:
stage: tests
- image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.10.1
+ image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.1
script:
- if [ -d data ] && [ -d code/data ] ; then echo "Directory data and code/data cannot both exist." ; /bin/false ; else true; fi
- if [ -d data ] ; then yaml-lint data ; else true; fi
@@ -92,6 +92,6 @@ yaml-validate:
rspec-unused:
stage: tests
- image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.10.1
+ image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.1
script: /usr/bin/bash ci/extra-rspec-checks.sh
diff --git a/.msync.yml b/.msync.yml
index e8e8703..52edd2a 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.10.1'
+modulesync_config_version: '2.11.1'
diff --git a/Dockerfile b/Dockerfile
index c898686..44f884e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
# podman build --build-arg GITLAB_ACCESS_TOKEN=<your_token> --build-arg SPEC=spec/defines/alias_spec.rb .
#
#
-FROM gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.10.1
+FROM gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.1
WORKDIR /opt/puppet
diff --git a/ci/Gemfile b/ci/Gemfile
index fbf6c3e..24d7a8c 100644
--- a/ci/Gemfile
+++ b/ci/Gemfile
@@ -11,8 +11,9 @@ def location_for(place, fake_version = nil)
end
group :test do
- gem 'voxpupuli-test', '~> 7.0', :require => false
- gem 'puppet_metadata', '~> 3.0', :require => false
+ gem 'voxpupuli-test', '~> 9.0', :require => false if RUBY_VERSION >= '3.0'
+ gem 'voxpupuli-test', '~> 7.0', :require => false if RUBY_VERSION <= '3.0'
+ gem 'puppet_metadata', '~> 4.0', :require => false
gem 'puppet-pson', :require => false if RUBY_VERSION >= '3.0'
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
diff --git a/ci/boilerplate/spec/classes/init_spec.rb b/ci/boilerplate/spec/classes/init_spec.rb
index 412bd45..4e256d4 100644
--- a/ci/boilerplate/spec/classes/init_spec.rb
+++ b/ci/boilerplate/spec/classes/init_spec.rb
@@ -20,8 +20,8 @@ describe 'dirac' do
let(:facts) do
facts
end
- case facts[:operatingsystemmajrelease]
- when '5'
+ case facts[:os]['release']['major']
+ when '8'
it { is_expected.to compile.with_all_deps }
# it { is_expected.to contain_file('/tmp/abc') }
else
diff --git a/ci/boilerplate/spec/defines/mytype_spec.rb b/ci/boilerplate/spec/defines/mytype_spec.rb
index c9b28ab..8047b0a 100644
--- a/ci/boilerplate/spec/defines/mytype_spec.rb
+++ b/ci/boilerplate/spec/defines/mytype_spec.rb
@@ -21,8 +21,8 @@ describe 'dirac::mytype' do
let(:facts) do
facts
end
- case facts[:operatingsystemmajrelease]
- when '5'
+ case facts[:os]['release']['major']
+ when '8'
it { is_expected.to compile.with_all_deps }
# it { is_expected.to contain_file('/tmp/abc') }
else
--
GitLab