Revert "Manage the big stuff as early as possible"

Build Chromium in a separate project and install in Stage 2.

This reverts commit b0bf06c3.

.gitlab-ci.yml

@@ -22,14 +22,14 @@
     - 'buildah push "${CI_REGISTRY_IMAGE}:${CPU}-${ROLE}"'
     - 'buildah push "${CI_REGISTRY_IMAGE}/debug:${CPU}-${ROLE}"'
 
-.'Build haswell-server':
+'Build haswell-server':
   <<: *template
   variables:
     CPU: 'haswell'
     ROLE: 'server'
     QEMU_ARCH: 'x86_64'
 
-.'Build haswell-workstation':
+'Build haswell-workstation':
   <<: *template
   variables:
     CPU: 'haswell'
@@ -50,14 +50,14 @@
     ROLE: 'workstation'
     QEMU_ARCH: 'aarch64'
 
-.'Build cortex-a53-crypto-server':
+'Build cortex-a53-crypto-server':
   <<: *template
   variables:
     CPU: 'cortex-a53-crypto'
     ROLE: 'server'
     QEMU_ARCH: 'aarch64'
 
-.'Build cortex-a8-server':
+'Build cortex-a8-server':
   <<: *template
   variables:
     CPU: 'cortex-a8'

Containerfile

@@ -23,10 +23,7 @@ RUN USE='-vaapi' emerge -v --update --deep --newuse --with-bdeps=y @world
 RUN emerge -v --update --deep --newuse --with-bdeps=y @world
 RUN emerge --depclean
 
-# Get the big stuff out of the way first
-RUN puppet agent --test --tags nest::role::workstation::chromium,nest::role::workstation::firefox,nest::role::workstation::xmonad --runtimeout 0; [ $? -eq 2 ]
-
-# Configure the rest of the stage
+# Configure the stage
 RUN puppet agent --test --runtimeout 0; [ $? -eq 2 ]
 
 RUN rm -rf /var/db/repos