Build against 'portage' Puppet environment

.gitlab-ci.yml

 ---
+variables:
+  JOBS: 8
+
 default:
   image: 'quay.io/containers/buildah'
   before_script:
     - 'cp "$REGISTRIES_CONF" /etc/containers/registries.conf'
 
-'Build nest/stage1:amd64-server.haswell':
+'Build nest/stage1:haswell-server':
   stage: 'build'
-  tags:
-    - 'nest'
+  tags: ['nest']
   script:
     - 'buildah bud --pull
                    --creds="${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}"
                    --security-opt seccomp=unconfined
+                   --build-arg STAGE0_TAG=haswell
                    --build-arg FACTER_build=stage1
-                   --build-arg FACTER_makeopts="-j4"
+                   --build-arg FACTER_emerge_default_opts="--jobs=${JOBS} --usepkg"
+                   --build-arg FACTER_makeopts="-j${JOBS}"
                    -v /nest:/nest
                    -v "${PUPPET_CERTIFICATE}:/etc/puppetlabs/puppet/ssl/certs/ci.pem"
                    -v "${PUPPET_PRIVATE_KEY}:/etc/puppetlabs/puppet/ssl/private_keys/ci.pem"
-                   -t "${CI_REGISTRY_IMAGE}:amd64-server.haswell"
-                   amd64-server.haswell'
-    - 'buildah push --creds="${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY_IMAGE}:amd64-server.haswell"'
+                   -t "${CI_REGISTRY_IMAGE}:haswell-server" .'
+    - 'buildah push --creds="${CI_REGISTRY_USER}:${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY_IMAGE}:haswell-server"'

Containerfile

+ARG STAGE0_TAG
+FROM nest/stage0:${STAGE0_TAG}
+
+ARG FACTER_build
+ARG FACTER_emerge_default_opts
+ARG FACTER_makeopts
+RUN puppet agent --test --environment=portage --certname ci --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
+
+CMD ["/bin/zsh"]

amd64-server.haswell/Containerfile

-FROM nest/stage0:amd64-server.haswell
-ARG FACTER_build
-ARG FACTER_makeopts
-RUN git clone --depth=1 https://gitlab.james.tl/nest/gentoo/portage.git /var/cache/portage/gentoo
-RUN puppet agent --test --certname ci --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
-CMD ["/bin/zsh"]