Skip to content
Snippets Groups Projects
Commit 23b0cb45 authored by Christophe Haen's avatar Christophe Haen
Browse files

Merge branch 'modulesync' into 'qa'

[Rundeck] Update from it-puppet-modulesync-configs 2.9.2

See merge request ai/it-puppet-module-dirac!109
parents a7412cee 8fd6ddb8
Branches
No related tags found
No related merge requests found
......@@ -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.1
TO: ${CI_REGISTRY_IMAGE}:alma9-puppet-ci-2.9.2
.rake_template: &rake_template
stage: tests
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.9.1
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.9.2
artifacts:
reports:
junit: code/rspec*.xml
......@@ -61,7 +61,7 @@ puppet7:
puppet8:
variables:
RUBY_VERSION: "3.2.2"
RUBY_VERSION: "3.2.4"
FACTER_GEM_VERSION: "~> 4.0"
PUPPET_VERSION: "~> 8.0"
RAKE_TARGET: test
......@@ -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.1
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.9.2
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.1
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.9.2
script: /usr/bin/bash ci/extra-rspec-checks.sh
modulesync_config_version: '2.9.1'
modulesync_config_version: '2.9.2'
......@@ -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.1
FROM gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.9.2
WORKDIR /opt/puppet
......
......@@ -23,7 +23,7 @@ RUN dnf clean all && dnf -y update && \
dnf clean all
RUN git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
RUN eval "$(rbenv init - bash)" && rbenv install 2.7.8
RUN eval "$(rbenv init - bash)" && rbenv install 3.2.2
RUN eval "$(rbenv init - bash)" && rbenv install 3.2.4
COPY . /it-puppet-module-dirac
......@@ -38,7 +38,7 @@ RUN cd /it-puppet-module-dirac/code && \
gem install bundler -v 2.3.26 ;\
rm -f ../ci/Gemfile.lock ;\
BUNDLE_GEMFILE=../ci/Gemfile FACTER_GEM_VERSION='~> 4.0' PUPPET_VERSION='~> 7.24.0' bundle install --full-index ;\
rbenv global 3.2.2 ;\
rbenv global 3.2.4 ;\
rm -f ../ci/Gemfile.lock ;\
BUNDLE_GEMFILE=../ci/Gemfile FACTER_GEM_VERSION='~> 4.0' PUPPET_VERSION='~> 8.0' bundle install --full-index
......@@ -20,6 +20,7 @@ group :test do
gem 'rspec_junit_formatter', :require => false
gem 'net-ldap', :require => false
gem 'rubocop-i18n', :require => false
gem 'rubocop-performance', :require => false
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment