Merge branch 'master' into vmWebhookUpdate

codeready-toolchain · Nov 25, 2024 · 0caee64 · 0caee64
2 parents 5467bf2 + 6162287
commit 0caee64
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 152 deletions.
diff --git a/scripts/ci/collect-logs.sh b/scripts/ci/collect-logs.sh
diff --git a/scripts/ci/manage-host-operator.sh b/scripts/ci/manage-host-operator.sh
@@ -87,16 +87,7 @@ else
     set -e
 fi
 
-MANAGE_OPERATOR_FILE=scripts/ci/manage-operator.sh
-OWNER_AND_BRANCH_LOCATION=${OWNER_AND_BRANCH_LOCATION:-codeready-toolchain/toolchain-cicd/master}
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-SCRIPT_NAME=$(basename ${MANAGE_OPERATOR_FILE})
-
-if [[ -f ${SCRIPT_DIR}/${SCRIPT_NAME} ]]; then
-    source ${SCRIPT_DIR}/${SCRIPT_NAME}
-else
-    source /dev/stdin <<< "$(curl -sSL https://raw.githubusercontent.com/${OWNER_AND_BRANCH_LOCATION}/${MANAGE_OPERATOR_FILE})"
-fi
+source scripts/ci/manage-operator.sh
 
 if [[ -n "${CI}${REG_REPO_PATH}${HOST_REPO_PATH}" ]] && [[ $(echo ${REPO_NAME} | sed 's/"//g') != "release" ]]; then
     REPOSITORY_NAME=registration-service

diff --git a/scripts/ci/manage-member-operator.sh b/scripts/ci/manage-member-operator.sh
@@ -86,16 +86,7 @@ else
     set -e
 fi
 
-MANAGE_OPERATOR_FILE=scripts/ci/manage-operator.sh
-OWNER_AND_BRANCH_LOCATION=${OWNER_AND_BRANCH_LOCATION:-codeready-toolchain/toolchain-cicd/master}
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-SCRIPT_NAME=$(basename ${MANAGE_OPERATOR_FILE})
-
-if [[ -f ${SCRIPT_DIR}/${SCRIPT_NAME} ]]; then
-    source ${SCRIPT_DIR}/${SCRIPT_NAME}
-else
-    source /dev/stdin <<< "$(curl -sSL https://raw.githubusercontent.com/${OWNER_AND_BRANCH_LOCATION}/${MANAGE_OPERATOR_FILE})"
-fi
+source scripts/ci/manage-operator.sh
 
 if [[ -n "${CI}${MEMBER_REPO_PATH}" ]] && [[ $(echo ${REPO_NAME} | sed 's/"//g') != "release" ]]; then
     REPOSITORY_NAME=member-operator

diff --git a/scripts/ci/manage-operator.sh b/scripts/ci/manage-operator.sh
@@ -7,7 +7,6 @@ else
 fi
 
 WAS_ALREADY_PAIRED_FILE=/tmp/toolchain_e2e_already_paired
-OWNER_AND_BRANCH_LOCATION=${OWNER_AND_BRANCH_LOCATION:-codeready-toolchain/toolchain-cicd/master}
 
 get_repo() {
     PAIRED=false
@@ -204,8 +203,7 @@ install_operator() {
             sleep 1
         done
     fi
-
-#    start_collecting_logs
+
 
     CATALOG_SOURCE_OBJECT="
 apiVersion: operators.coreos.com/v1alpha1
@@ -272,32 +270,7 @@ EOF
 wait_until_is_installed
 }
 
-
-start_collecting_logs() {
-    COLLECT_LOGS=scripts/ci/collect-logs.sh
-    SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-    SCRIPT_NAME=$(basename ${COLLECT_LOGS})
-
-    if [[ -f ${SCRIPT_DIR}/${SCRIPT_NAME} ]]; then
-        ${SCRIPT_DIR}/${SCRIPT_NAME} -n ${NAMESPACE} &
-        ${SCRIPT_DIR}/${SCRIPT_NAME} -n "openshift-operator-lifecycle-manager"  &
-    else
-        SCRIPT_NAME=$(basename ${COLLECT_LOGS})
-        curl -sSL https://raw.githubusercontent.com/${OWNER_AND_BRANCH_LOCATION}/${COLLECT_LOGS} > /tmp/${SCRIPT_NAME} && chmod +x /tmp/${SCRIPT_NAME}
-        OWNER_AND_BRANCH_LOCATION=${OWNER_AND_BRANCH_LOCATION} /tmp/${SCRIPT_NAME} -n ${NAMESPACE} &
-        OWNER_AND_BRANCH_LOCATION=${OWNER_AND_BRANCH_LOCATION} /tmp/${SCRIPT_NAME} -n "openshift-operator-lifecycle-manager" &
-    fi
-}
-
 wait_until_is_installed() {
-    WAIT_UNTIL_IS_INSTALLED=scripts/ci/wait-until-is-installed.sh
     PARAMS="-crd ${EXPECT_CRD} -cs ${CATALOGSOURCE_NAME} -n ${NAMESPACE} -s ${SUBSCRIPTION_NAME}"
-    SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-    SCRIPT_NAME=$(basename ${WAIT_UNTIL_IS_INSTALLED})
-
-    if [[ -f ${SCRIPT_DIR}/${SCRIPT_NAME} ]]; then
-        ${SCRIPT_DIR}/${SCRIPT_NAME} ${PARAMS}
-    else
-        curl -sSL https://raw.githubusercontent.com/${OWNER_AND_BRANCH_LOCATION}/${WAIT_UNTIL_IS_INSTALLED} > /tmp/${SCRIPT_NAME} && chmod +x /tmp/${SCRIPT_NAME} && OWNER_AND_BRANCH_LOCATION=${OWNER_AND_BRANCH_LOCATION} /tmp/${SCRIPT_NAME} ${PARAMS}
-    fi
+    scripts/ci/wait-until-is-installed.sh ${PARAMS}
 }
diff --git a/scripts/ci/setup-dev-sso.sh b/scripts/ci/setup-dev-sso.sh
@@ -60,16 +60,8 @@ check_command()
 }
 
 run_wait_until_is_installed() {
-    WAIT_UNTIL_IS_INSTALLED=scripts/ci/wait-until-is-installed.sh
     PARAMS="-crd keycloak.org -cs '' -n ${DEV_SSO_NS} -s ${SUBSCRIPTION_NAME}"
-    SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-    SCRIPT_NAME=$(basename ${WAIT_UNTIL_IS_INSTALLED})
-
-    if [[ -f ${SCRIPT_DIR}/${SCRIPT_NAME} ]]; then
-        ${SCRIPT_DIR}/${SCRIPT_NAME} ${PARAMS}
-    else
-        curl -sSL https://raw.githubusercontent.com/${OWNER_AND_BRANCH_LOCATION}/${WAIT_UNTIL_IS_INSTALLED} > /tmp/${SCRIPT_NAME} && chmod +x /tmp/${SCRIPT_NAME} && OWNER_AND_BRANCH_LOCATION=${OWNER_AND_BRANCH_LOCATION} /tmp/${SCRIPT_NAME} ${PARAMS}
-    fi
+    scripts/ci/wait-until-is-installed.sh ${PARAMS}
 }
 
 setup_oauth_generic()