Commit 145c6025 authored by James T. Lee's avatar James T. Lee
Browse files

Restore FACTER_makeopts

Puppet does weird calculations with distcc that don't work when the CI
host is also a distcc server.
parent c8ba6d94
Pipeline #244 canceled with stage
in 6 minutes and 57 seconds
...@@ -12,6 +12,7 @@ default: ...@@ -12,6 +12,7 @@ default:
- 'buildah bud --pull - 'buildah bud --pull
--security-opt seccomp=unconfined --security-opt seccomp=unconfined
--build-arg STAGE0_TAG=haswell --build-arg STAGE0_TAG=haswell
--build-arg FACTER_makeopts="$CI_HOST_MAKEOPTS"
-v "${PUPPET_CERTIFICATE}:/etc/puppetlabs/puppet/ssl/certs/ci.pem" -v "${PUPPET_CERTIFICATE}:/etc/puppetlabs/puppet/ssl/certs/ci.pem"
-v "${PUPPET_PRIVATE_KEY}:/etc/puppetlabs/puppet/ssl/private_keys/ci.pem" -v "${PUPPET_PRIVATE_KEY}:/etc/puppetlabs/puppet/ssl/private_keys/ci.pem"
-v "${PWD}/debug:/usr/lib/debug" -v "${PWD}/debug:/usr/lib/debug"
......
ARG STAGE0_TAG ARG STAGE0_TAG
FROM nest/stage0:${STAGE0_TAG} FROM nest/stage0:${STAGE0_TAG}
ARG FACTER_makeopts
RUN eix-sync -q RUN eix-sync -q
RUN FACTER_build=stage1 puppet agent --test --certname ci --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ] RUN FACTER_build=stage1 puppet agent --test --certname ci --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
RUN rm -rf /var/db/repos RUN rm -rf /var/db/repos
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment