Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nest
Stage 1
Commits
796f7ec5
Commit
796f7ec5
authored
Apr 16, 2021
by
James T. Lee
Browse files
Change certname from ci to builder
CI is jargon.
parent
1dab5642
Pipeline
#651
canceled with stage
in 2392 minutes and 5 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
.gitlab-ci.yml
.gitlab-ci.yml
+2
-2
Containerfile
Containerfile
+1
-1
No files found.
.gitlab-ci.yml
View file @
796f7ec5
...
...
@@ -13,8 +13,8 @@
--build-arg
FACTER_makeopts="$CI_HOST_MAKEOPTS"
--build-arg
PROFILE="${CPU}/${ROLE}"
-v
"/usr/bin/qemu-${QEMU_ARCH}:/usr/bin/qemu-${QEMU_ARCH}:ro"
-v
"${PUPPET_CERTIFICATE}:/etc/puppetlabs/puppet/ssl/certs/
ci
.pem"
-v
"${PUPPET_PRIVATE_KEY}:/etc/puppetlabs/puppet/ssl/private_keys/
ci
.pem"
-v
"${PUPPET_CERTIFICATE}:/etc/puppetlabs/puppet/ssl/certs/
builder
.pem"
-v
"${PUPPET_PRIVATE_KEY}:/etc/puppetlabs/puppet/ssl/private_keys/
builder
.pem"
-v
"${PWD}/debug/usr/lib/debug:/usr/lib/debug"
-v
/nest:/nest
-t
"${CI_REGISTRY_IMAGE}:${CPU}-${ROLE}"
.'
...
...
Containerfile
View file @
796f7ec5
...
...
@@ -9,7 +9,7 @@ ARG PROFILE
RUN eix-sync -q
# Configure locales and set up some conveniences
RUN puppet agent --test --certname
ci
--environment main --tags nest::base::distcc,nest::base::locale,nest::base::portage,nest::base::puppet --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
RUN puppet agent --test --certname
builder
--environment main --tags nest::base::distcc,nest::base::locale,nest::base::portage,nest::base::puppet --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
# Locale is managed by Puppet, but
# it also needs to be persisted in the image.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment