Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
it-puppet-module-ci_images
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ai
it-puppet-module-ci_images
Commits
84b43086
Commit
84b43086
authored
2 months ago
by
Steve Traylen
Browse files
Options
Downloads
Plain Diff
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
!136
Release candidate - 2.11.2-rc0
Pipeline
#10371733
passed
2 months ago
Stage: scan-policies
Stage: images
Stage: tests
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+4
-4
4 additions, 4 deletions
.gitlab-ci.yml
.msync.yml
+1
-1
1 addition, 1 deletion
.msync.yml
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
with
6 additions
and
6 deletions
.gitlab-ci.yml
+
4
−
4
View file @
84b43086
...
...
@@ -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
This diff is collapsed.
Click to expand it.
.msync.yml
+
1
−
1
View file @
84b43086
modulesync_config_version
:
'
2.11.
1
'
modulesync_config_version
:
'
2.11.
2-rc0
'
This diff is collapsed.
Click to expand it.
Dockerfile
+
1
−
1
View file @
84b43086
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment