Skip to content
Snippets Groups Projects
Commit 84b43086 authored by Steve Traylen's avatar Steve Traylen
Browse files

Merge branch 'rc' into 'qa'

Release candidate - 2.11.2-rc0

See merge request !136
parents 907bf943 4cbeb03a
No related branches found
No related tags found
1 merge request!136Release candidate - 2.11.2-rc0
Pipeline #10371733 passed
......@@ -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.11.1
TO: ${CI_REGISTRY_IMAGE}:alma9-puppet-ci-2.11.2-rc0
.rake_template: &rake_template
stage: tests
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.1
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.2-rc0
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.11.1
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.2-rc0
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.11.1
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.2-rc0
script: /usr/bin/bash ci/extra-rspec-checks.sh
modulesync_config_version: '2.11.1'
modulesync_config_version: '2.11.2-rc0'
......@@ -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.11.1
FROM gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:alma9-puppet-ci-2.11.2-rc0
WORKDIR /opt/puppet
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment