test: update scenario test env to prepare for parallel mock work (#319)

Author: reubeno

scenario/component_query_test.go

@@ -30,6 +30,7 @@ func TestQueryingAComponent(t *testing.T) {
 	testScript := `
 set -euxo pipefail
 azldev project init
+ln -s /var/lib/mock build # Ensure the build output dir is writable by mock
 
 cat <<EOF >test-component.spec
 Name: test-component

scenario/docker/Dockerfile

@@ -6,42 +6,38 @@ SHELL ["/bin/bash", "-c"]
 ARG TIMESTAMP
 RUN echo "Image built at ${TIMESTAMP}" > /etc/azldev_scenario_testing_timestamp
 
-ARG USER_CONFIG
+ARG UID
+ARG GID
 ARG WORK_DIR
 
-ENV USER_CONFIG=${USER_CONFIG}
+ENV UID=${UID}
+ENV GID=${GID}
 
 LABEL name="azldev_scenario_testing"
 
-# Install dependencies
-#   * We requires shadow-utils to be able to manage users and groups
+# Install early dependencies
+#   * We require shadow-utils to be able to manage users and groups
+RUN tdnf -y install shadow-utils
+
+# Create mock group and test user up-front, using the same UID and GID as the host's user so it lines up.
+RUN groupadd -f -g "${GID}" mock && \
+    useradd -u "${UID}" -g "${GID}" -m testuser && \
+    mkdir -p /etc/sudoers.d && \
+    echo "testuser ALL=(ALL) NOPASSWD: ALL" >/etc/sudoers.d/testuser
+
+# Install additional dependencies
 #   * We require ca-certificates to be able to interact with standard https endpoints
 #   * We require mock to build packages
 #   * We require sudo to run commands as root after dropping to test user
 RUN tdnf -y install \
-    shadow-utils \
     ca-certificates \
     mock \
     sudo
 
-# Set up the default user (named "testuser") with the UID and GID we were given.
-#
-# NOTE: The <<< syntax requires use of bash (instead of /bin/sh), hence the SHELL directive above.
-RUN groupadd -f -g "$(cut -d: -f2 <<<"${USER_CONFIG}")" testuser && \
-    useradd -u "$(cut -d: -f1 <<<"${USER_CONFIG}")" \
-            -g "$(cut -d: -f2 <<<"${USER_CONFIG}")" \
-            -m \
-            testuser && \
-    echo "testuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/testuser
-
-# Add the user to the 'mock' group
-RUN usermod -aG mock testuser && \
-    usermod -aG root testuser
-
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 
 # Set the default user
-USER ${USER_CONFIG}
+USER testuser:mock
 
 # Switch to the well-known work directory that the test infrastructure will
 # copy files into.

scenario/docker/entrypoint.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 # In case some files were copied into the container after building the Dockerfile,
 # make sure the work directory is entirely owned by the test user.

scenario/internal/containertest/containers.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -203,6 +204,9 @@ func runCmdInContainerImpl(
 	// expects a string pointer for the build args and consts can't be used.
 	containerWorkDir := ContainerWorkDir
 
+	uidStr := strconv.Itoa(os.Getuid())
+	gidStr := strconv.Itoa(os.Getgid())
+
 	// Build the container request. It is based on ./docker/Dockerfile. It will
 	// mount the collateral.workdir directory into the container at /workdir, place
 	// the azldev command at /azldev, and run the command in the container.
@@ -218,9 +222,10 @@ func runCmdInContainerImpl(
 				KeepImage:      true,
 				BuildLogWriter: logger.buildLogWriter,
 				BuildArgs: map[string]*string{
-					"USER_CONFIG": getUserConfig(t),
-					"WORK_DIR":    &containerWorkDir,
-					"TIMESTAMP":   getRefreshTimestamp(t),
+					"UID":       &uidStr,
+					"GID":       &gidStr,
+					"WORK_DIR":  &containerWorkDir,
+					"TIMESTAMP": getRefreshTimestamp(t),
 				},
 			},
 
@@ -413,15 +418,6 @@ func getTimeoutConfig(t *testing.T, timeout time.Duration) *delayStrategy {
 	return strategy
 }
 
-func getUserConfig(t *testing.T) *string {
-	t.Helper()
-
-	// Get the user and group for the current user.
-	output := fmt.Sprintf("%d:%d", os.Getuid(), os.Getgid())
-
-	return &output
-}
-
 func getNetworkConfig(t *testing.T, network bool) []string {
 	t.Helper()
 

scenario/internal/projecttest/projecttest.go

@@ -53,6 +53,12 @@ func (p *ProjectTest) RunInContainer(t *testing.T) *ProjectTestResults {
 	// Create a script that runs the command with the provided arguments.
 	testScript := fmt.Sprintf(`
 set -x
+
+# Ensure the build output dir is writable by mock; we accomplish this by symlinking
+# to the well-known dir created by mock for this purpose.
+rm -rf project/build
+ln -s /var/lib/mock project/build
+
 azldev -C project -v %s --output-format json >result.json
 `, strings.Join(p.commandArgs, " "))