Skip to content
Snippets Groups Projects
Commit d6a27556 authored by Andre Philippe Sailer's avatar Andre Philippe Sailer
Browse files

Merge branch 'master_modulesync' into 'master'

Merge branch 'modulesync' into 'qa'

See merge request ai/it-puppet-module-dirac!127
parents 8363131b 2a576a5c
No related branches found
No related tags found
No related merge requests found
*.rb eol=lf
*.erb eol=lf
*.pp eol=lf
*.sh eol=lf
*.epp eol=lf
......@@ -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.9.2
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.9.2
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.9.2
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.9.2
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
modulesync_config_version: '2.9.2'
modulesync_config_version: '2.11.1'
......@@ -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.9.2
FROM gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.1
WORKDIR /opt/puppet
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment