tests: always specify server image name in ad test

When deploying a member server the yaml was inconsistently using both
images built for the test run (PR) and images pushed to quay.io. First,
make the yaml use one consistent variable name for all images, then
force the shell script to explicitly set those vars.

Signed-off-by: John Mulligan <[email protected]>

Author: phlogistonjohn

tests/files/samba-domain-member-pod.yml

@@ -74,10 +74,10 @@ metadata:
 spec:
   shareProcessNamespace: true
   containers:
-    - image: samba-server:$IMG_TAG
+    - image: $IMG_NAME
       # Need imagePullPolicy Never for working with local images.
       # Otherwise we get "ErrImagePull".
-      imagePullPolicy: Never
+      imagePullPolicy: $IMG_PULL_POLICY
       name: smb
       command:
       - "samba-container"
@@ -109,7 +109,8 @@ spec:
         name: samba-state-dir
       - mountPath: "/run/samba/winbindd"
         name: samba-sockets-dir
-    - image: quay.io/samba.org/samba-server:$IMG_TAG
+    - image: $IMG_NAME
+      imagePullPolicy: $IMG_PULL_POLICY
       name: winbind
       command:
       - "samba-container"
@@ -134,7 +135,8 @@ spec:
       - mountPath: "/run/samba/winbindd"
         name: samba-sockets-dir
   initContainers:
-    - image: quay.io/samba.org/samba-server:$IMG_TAG
+    - image: $IMG_NAME
+      imagePullPolicy: $IMG_PULL_POLICY
       name: init
       args:
       - "init"
@@ -154,7 +156,8 @@ spec:
         name: samba-container-config
       - mountPath: "/var/lib/samba"
         name: samba-state-dir
-    - image: quay.io/samba.org/samba-server:$IMG_TAG
+    - image: $IMG_NAME
+      imagePullPolicy: $IMG_PULL_POLICY
       name: must-join
       args:
       - "must-join"

tests/test-deploy-ad-member.sh

@@ -2,11 +2,13 @@
 
 SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)"
 IMG_TAG=${IMG_TAG:-"latest"}
+IMG_NAME="${SERVER_IMG:-samba-server}:${IMG_TAG}"
+IMG_PULL_POLICY="${IMG_PULL_POLICY:-Never}"
 
 source "${SCRIPT_DIR}/common.sh"
 
 echo "Creating ad member pod..."
-ERROR_MSG=$(IMG_TAG=${IMG_TAG} envsubst < "${MEMBER_POD_YAML}" | kubectl create -f - 2>&1 1>/dev/null)
+ERROR_MSG=$(IMG_NAME="${IMG_NAME}" IMG_PULL_POLICY="${IMG_PULL_POLICY}" envsubst < "${MEMBER_POD_YAML}" | kubectl create -f - 2>&1 1>/dev/null)
 if [ $? -ne 0 ] ; then
 	if [[ "${ERROR_MSG}" =~ "AlreadyExists" ]] ; then
 		echo "pod exists already. Continuing."