improve container execution logging

Signed-off-by: Tiago Bueno <49003339+tlbueno@users.noreply.github.com>

Makefile

@@ -12,6 +12,7 @@ OPERATOR_SUITE_DIR                             = ${ROOT_DIR}/operator-suite
 STANDALONE_SUITE_DIR                           = ${ROOT_DIR}/standalone-suite
 VERSION_PROPERTIES_FILE                       ?= ${ROOT_DIR}/claire_properties.yaml
 BUILD_PROPERTIES                               = ${ROOT_DIR}/build_properties.yaml
+COMMIT_ID                                      = $(shell git rev-parse HEAD)
 
 ### Commands variables
 MVN_DEFAULT_CMD                                = mvn --no-transfer-progress --update-snapshots -Dmaven.repo.local=./.m2/repository
@@ -445,6 +446,7 @@ build_container:
 	  	if [[ "${OPERATOR_CONTAINER_SKIP_BUILD}" == "false" ]]; then \
 			podman build --arch=$${arch} --tag $${FULL_VERSION_WITH_ARCH} --build-arg buildArch=$${arch} \
 						--build-arg operatorType=${OPERATOR_TYPE_FINAL} --build-arg operatorVersion=${OPERATOR_VERSION} \
+						--build-arg commitId=${COMMIT_ID} \
 						--file operator-suite/container/Containerfile . ;\
 			if [[ "${OPERATOR_TYPE_FINAL}" == "amq-broker" ]]; then \
 				echo "Creating tag from $${FULL_VERSION_WITH_ARCH} to $${MMM_VERSION_WITH_ARCH}" ;\

operator-suite/container/Containerfile

@@ -43,6 +43,7 @@ ARG operatorVersion
 ARG claireUser=claire
 ARG claireUserUid=1000
 ARG claireUserGroup=root
+ARG commitId
 
 # Create claire user
 RUN useradd -u "${claireUserUid}" -d "/app" -m -g "${claireUserGroup}" "${claireUser}" && \
@@ -84,6 +85,9 @@ USER ${CLAIRE_USER_UID}
 ENTRYPOINT ["/app/operator-suite/container/entrypoint.sh"]
 CMD ["/bin/bash"]
 
+# Set the current commit id
+ENV COMMIT_ID=${commitId}
+
 # Copy cliare files
 COPY --chown=${CLAIRE_USER_UID}:${CLAIRE_USER_GROUP} . /app/
 

operator-suite/container/scripts/run-test.sh

@@ -71,6 +71,7 @@ if [[ "${#_arg_make_envvar[@]}" -gt 0  ]]; then
 fi
 yq -i e '(.metadata.namespace = strenv(NAMESPACE))' "${SCRIPT_DIR}/yaml/030-pod.yaml.$$"
 yq -i e '(.spec.containers[].image = strenv(IMAGE))' "${SCRIPT_DIR}/yaml/030-pod.yaml.$$"
+yq -i e '.spec.containers[].env[] |= select(.name == "CONTAINER_IMAGE") |= .value = strenv(IMAGE)' "${SCRIPT_DIR}/yaml/030-pod.yaml.$$"
 tee >(kubectl apply -f -) < "${SCRIPT_DIR}/yaml/030-pod.yaml.$$"
 rm -rf "${SCRIPT_DIR}/yaml/030-pod.yaml.$$"
 sleep 5
@@ -83,8 +84,8 @@ if kubectl wait -n "${NAMESPACE}" --for=jsonpath='{.status.phase}'='Running' pod
     log "Waiting execution to finish"
     set +e
     while ! kubectl -n "${NAMESPACE}" exec claire-test-suite -- /bin/ls /app/test-results/tests.execution.completed > /dev/null 2>&1; do
-    log "Execution not completed. Waiting for ${_arg_test_completion_wait_check} seconds before check again"
-    sleep "${_arg_test_completion_wait_check}"
+        log "Execution not completed. Waiting for ${_arg_test_completion_wait_check} seconds before check again"
+        sleep "${_arg_test_completion_wait_check}"
     done
     set -e
 

operator-suite/container/scripts/yaml/020-configmap.yaml

@@ -22,6 +22,9 @@ data:
         fi
     }
 
+    log ""
+    log "Running with git commit id: $${COMMIT_ID}"
+    log "Running with image: $${CONTAINER_IMAGE}"
     log ""
     log "Creating test-results directory: $${OPERATOR_TEST_RESULTS_DIR}"
     mkdir -p "$${OPERATOR_TEST_RESULTS_DIR}"

operator-suite/container/scripts/yaml/030-pod.yaml

@@ -15,6 +15,9 @@ spec:
       image: ${IMAGE}
       imagePullPolicy: Always
       command: ["/app/run.sh"]
+      env:
+        - name: CONTAINER_IMAGE
+          value: ${IMAGE}
       volumeMounts:
         - name: run-script-volume
           mountPath: /app/run.sh