Merge pull request #555 from application-stacks/version-check

Check correct operator version is installed at the acceptance test stage

Author: yongja79

Makefile

@@ -353,7 +353,8 @@ test-pipeline-e2e:
                      --registry-name "${PIPELINE_REGISTRY}" --registry-image "${PIPELINE_OPERATOR_IMAGE}" \
                      --registry-user "${PIPELINE_USERNAME}" --registry-password "${PIPELINE_PASSWORD}" \
                      --test-tag "${TRAVIS_BUILD_NUMBER}" --release "${RELEASE_TARGET}" --channel "${DEFAULT_CHANNEL}" \
-					 --install-mode "${INSTALL_MODE}" --architecture "${ARCHITECTURE}"
+					 --install-mode "${INSTALL_MODE}" --architecture "${ARCHITECTURE}" \
+					 --digest "${DIGEST}" --version "${VERSION}"
 
 bundle-build-podman:
 	podman build -f bundle.Dockerfile -t "${BUNDLE_IMG}"

scripts/acceptance-test.sh

@@ -28,6 +28,7 @@ declare -A E2E_TESTS=(
 		--env DEBUG_FAILURE=${DEBUG_FAILURE} \
 		--env INSTALL_MODE=${INSTALL_MODE} \
 		--env ARCHITECTURE=${ARCHITECTURE} \
+		--env DIGEST=${DIGEST} \
 		e2e-runner:latest \
 		make test-pipeline-e2e
 		EOF

scripts/pipeline/ocp-cluster-e2e.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-readonly usage="Usage: ocp-cluster-e2e.sh -u <docker-username> -p <docker-password> --cluster-url <url> --cluster-token <token> --registry-name <name> --registry-image <ns/image> --registry-user <user> --registry-password <password> --release <daily|release-tag> --test-tag <test-id> --catalog-image <catalog-image> --channel <channel>"
+readonly usage="Usage: ocp-cluster-e2e.sh -u <docker-username> -p <docker-password> --cluster-url <url> --cluster-token <token> --registry-name <name> --registry-image <ns/image> --registry-user <user> --registry-password <password> --release <daily|release-tag> --test-tag <test-id> --catalog-image <catalog-image> --channel <channel> --architecture <architecture> --digest <digest> --version <version>"
 readonly OC_CLIENT_VERSION="latest-4.10"
 readonly CONTROLLER_MANAGER_NAME="rco-controller-manager"
 
@@ -174,6 +174,18 @@ main() {
         exit 1
     fi
 
+    if [[ -z "${DIGEST}" ]]; then
+        echo "****** Missing digest, see usage"
+        echo "${usage}"
+        exit 1
+    fi
+
+    if [[ -z "${VERSION}" ]]; then
+        echo "****** Missing version, see usage"
+        echo "${usage}"
+        exit 1
+    fi
+
     echo "****** Setting up test environment..."
     setup_env
 
@@ -229,6 +241,19 @@ main() {
         sleep 10
     done
 
+    # Check correct version of the operator has been installed
+    img_digest="icr.io/appcafe/runtime-component-operator@${DIGEST}"
+    echo "Expect operator image version: ${img_digest}"
+    pod=$(oc get pods -n "${TEST_NAMESPACE}" | awk '{print $1}' | grep rco-controller-manager)
+    install_img="$(oc get pod -n "${TEST_NAMESPACE}" ${pod} -o jsonpath={.spec.containers..image})"
+    echo "Actual installed operation image version: ${install_img}"
+    if [[ "${install_img}" != "${img_digest}" ]]; then
+        echo "Install Operator image ${install_img} does not match correct image ${img_digest}"
+        exit 1
+    else
+        echo "Correct Operator image running"
+    fi
+
     echo "****** ${CONTROLLER_MANAGER_NAME} deployment is ready..."
 
     if [[ "$ARCHITECTURE" != "Z" ]]; then
@@ -285,7 +310,7 @@ spec:
 EOF
 fi
 
-    echo "****** Applying the subscription..."
+    echo "****** Applying the subscription for version: ${VERSION}"
     cat <<EOF | oc apply -f -
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
@@ -298,6 +323,7 @@ spec:
   source: runtime-component-catalog
   sourceNamespace: openshift-marketplace
   installPlanApproval: Automatic
+  startingCSV: runtime-component.v${VERSION}
 EOF
 }
 
@@ -398,6 +424,14 @@ parse_args() {
       shift
       readonly ARCHITECTURE="${1}"
       ;;  
+    --digest)
+      shift
+      readonly DIGEST="${1}"
+      ;;
+    --version)
+      shift
+      readonly VERSION="${1}"
+      ;;  
     *)
       echo "Error: Invalid argument - $1"
       echo "$usage"

scripts/pipeline/runTest.sh

@@ -44,6 +44,14 @@ export FYRE_KEY=$(get_env fyre-key)
 export FYRE_PASS=$(get_env fyre-pass)
 export FYRE_PRODUCT_GROUP_ID=$(get_env fyre-product-group-id)
 
+echo "${PIPELINE_PASSWORD}" | docker login "${PIPELINE_REGISTRY}" -u "${PIPELINE_USERNAME}" --password-stdin
+IMAGE="${PIPELINE_REGISTRY}/${PIPELINE_OPERATOR_IMAGE}:${RELEASE_TARGET}"
+echo "one-pipline Image value: ${IMAGE}"
+DIGEST="$(skopeo inspect docker://$IMAGE | grep Digest | grep -o 'sha[^\"]*')"
+
+export DIGEST
+echo "one-pipeline Digest Value: ${DIGEST}"
+
 cd ../..
 echo "directory before acceptance-test.sh"
 pwd