From 9ce1337c9dca29720acde377d3e313b053de0707 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Wed, 31 Aug 2022 18:03:05 +0300 Subject: [PATCH] feat: Add testCatalogFromSources.sh (#1492) Signed-off-by: Anatolii Bazko Signed-off-by: Anatolii Bazko --- build/scripts/oc-tests/oc-common.sh | 96 ----------- build/scripts/oc-tests/oc-test-operator.sh | 6 +- build/scripts/olm/testCatalogFromSources.sh | 181 ++++++++++++++++++++ 3 files changed, 183 insertions(+), 100 deletions(-) create mode 100755 build/scripts/olm/testCatalogFromSources.sh diff --git a/build/scripts/oc-tests/oc-common.sh b/build/scripts/oc-tests/oc-common.sh index 6d85e0dc0..1c1c17c6b 100644 --- a/build/scripts/oc-tests/oc-common.sh +++ b/build/scripts/oc-tests/oc-common.sh @@ -68,102 +68,6 @@ discoverEclipseCheSubscription() { ECLIPSE_CHE_INSTALLED_CSV=$(echo ${ECLIPSE_CHE_SUBSCRIPTION_RECORD} | jq -r '.status.installedCSV') } -buildBundleFromSources() { - local TMP_BUNDLE_DIR=/tmp/bundle - rm -rf ${TMP_BUNDLE_DIR} - mkdir ${TMP_BUNDLE_DIR} - - cp -r $(make bundle-path CHANNEL=next)/* ${TMP_BUNDLE_DIR} - mv ${TMP_BUNDLE_DIR}/bundle.Dockerfile ${TMP_BUNDLE_DIR}/Dockerfile - - # Use custom image in a bundle - # CI_CHE_OPERATOR_IMAGE it is che operator image built in openshift CI job workflow. - yq -rYi '.spec.install.spec.deployments[0].spec.template.spec.containers[0].image = "'${CI_CHE_OPERATOR_IMAGE}'"' ${TMP_BUNDLE_DIR}/manifests/che-operator.clusterserviceversion.yaml - - oc new-build --binary --strategy docker --name ${BUNDLE_NAME} -n ${NAMESPACE} - oc start-build ${BUNDLE_NAME} --from-dir ${TMP_BUNDLE_DIR} -n ${NAMESPACE} --wait -} - -createRpcCatalogSource() { - IMAGE_REGISTRY_USER_NAME=kubeadmin - IMAGE_REGISTRY_USER_TOKEN=$(oc whoami -t) - - oc apply -f - </dev/null 2>&1; then + cat > /tmp/htpasswd.conf </dev/null 2>&1; do printf '.'; sleep 1; done" + IMAGE_REGISTRY_VIEWER_USER_TOKEN=$(oc --kubeconfig=/tmp/${IMAGE_REGISTRY_VIEWER_USER_NAME}.kubeconfig whoami -t) + + oc policy add-role-to-user registry-viewer ${IMAGE_REGISTRY_VIEWER_USER_NAME} -n ${NAMESPACE} +} + +createOLMRegistry() { + oc apply -f - <