fix(RHIDP-4928): Remove obsolete workaround (#138)

Signed-off-by: Pavel Macík <[email protected]>
redhat-performance · Dec 12, 2024 · 9704715 · 9704715
1 parent c4521d7
commit 9704715
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 25 deletions.
diff --git a/ci-scripts/release-tests.sh b/ci-scripts/release-tests.sh
@@ -84,6 +84,6 @@ function storage_limit_test() {
 VERSION_OLD="1.3"
 VERSION_NEW="1.4"
 RHDH_HELM_REPO_OLD="https://charts.openshift.io/"
-RHDH_HELM_REPO_NEW="https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/refs/heads/redhat-developer-hub-1.4-69-CI/installation"
+RHDH_HELM_REPO_NEW="https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/refs/heads/redhat-developer-hub-1.4-117-CI/installation"
 entity_burden_test "RHIDP-4541"
 #storage_limit_test "RHIDP-4531"
diff --git a/ci-scripts/rhdh-setup/deploy.sh b/ci-scripts/rhdh-setup/deploy.sh
@@ -36,12 +36,12 @@ export RHDH_IMAGE_REGISTRY=${RHDH_IMAGE_REGISTRY:-}
 export RHDH_IMAGE_REPO=${RHDH_IMAGE_REPO:-}
 export RHDH_IMAGE_TAG=${RHDH_IMAGE_TAG:-}
 
-export RHDH_HELM_REPO=${RHDH_HELM_REPO:-https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/rhdh-1.3-rhel-9/installation}
+export RHDH_HELM_REPO=${RHDH_HELM_REPO:-https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/rhdh-1.4-rhel-9/installation}
 export RHDH_HELM_CHART=${RHDH_HELM_CHART:-redhat-developer-hub}
 export RHDH_HELM_CHART_VERSION=${RHDH_HELM_CHART_VERSION:-}
 
 OCP_VER="$(oc version -o json | jq -r '.openshiftVersion' | sed -r -e "s#([0-9]+\.[0-9]+)\..+#\1#")"
-export RHDH_OLM_INDEX_IMAGE="${RHDH_OLM_INDEX_IMAGE:-quay.io/rhdh/iib:1.3-v${OCP_VER}-x86_64}"
+export RHDH_OLM_INDEX_IMAGE="${RHDH_OLM_INDEX_IMAGE:-quay.io/rhdh/iib:1.4-v${OCP_VER}-x86_64}"
 export RHDH_OLM_CHANNEL=${RHDH_OLM_CHANNEL:-fast}
 export RHDH_OLM_OPERATOR_PACKAGE=${RHDH_OLM_OPERATOR_PACKAGE:-rhdh}
 
@@ -211,24 +211,6 @@ create_objs() {
     fi
 }
 
-# TODO: remove once https://issues.redhat.com/browse/RHIDP-4936 and https://issues.redhat.com/browse/RHIDP-4937 are fixed
-RHIDP-4936_RHIDP-4937_workaround() {
-    log_info "Applyling workaround for https://issues.redhat.com/browse/RHIDP-4936 and https://issues.redhat.com/browse/RHIDP-4937 issues"
-    pod=$($clin get pods -l app.kubernetes.io/instance=rhdh -o json | jq -rc '.items[] | select(.metadata.name | startswith("rhdh-developer-hub")).metadata.name')
-    for package in backstage-community-plugin-catalog-backend-module-keycloak-dynamic backstage-plugin-techdocs-backend-dynamic; do
-        log_info "Applying workaround for $package package"
-        $clin exec "$pod" -c backstage-backend -- bash -c "for i in \$(find /opt/app-root/src/dynamic-plugins-root -type d -name '$package*'); do cd \$i; npm install; done"
-    done
-    log_info "Restarting RHDH..."
-    if [ "$INSTALL_METHOD" == "helm" ]; then
-        rhdh_deployment="${RHDH_HELM_RELEASE_NAME}-developer-hub"
-    elif [ "$INSTALL_METHOD" == "olm" ]; then
-        rhdh_deployment=backstage-developer-hub
-    fi
-    $clin rollout restart deployment/"$rhdh_deployment"
-    wait_to_start deployment "$rhdh_deployment" 300 300
-}
-
 backstage_install() {
     log_info "Installing RHDH with install method: $INSTALL_METHOD"
     cp "template/backstage/app-config.yaml" "$TMP_DIR/app-config.yaml"
@@ -280,7 +262,6 @@ backstage_install() {
         fi
         envsubst <template/backstage/rhdh-servicemonitor.yaml | $clin create -f -
     fi
-    RHIDP-4936_RHIDP-4937_workaround # TODO: remove once https://issues.redhat.com/browse/RHIDP-4936 and https://issues.redhat.com/browse/RHIDP-4937 are fixed
     log_info "RHDH Installed, waiting for the catalog to be populated"
     timeout=600
     timeout_timestamp=$(date -d "$timeout seconds" "+%s")

diff --git a/ci-scripts/scalability/test-scalability.sh b/ci-scripts/scalability/test-scalability.sh
@@ -5,7 +5,7 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 source "$(readlink -m "$SCRIPT_DIR"/../../test.env)"
 
 export PRE_LOAD_DB=${PRE_LOAD_DB:-true}
-export RHDH_HELM_REPO=${RHDH_HELM_REPO:-https://gist.githubusercontent.com/rhdh-bot/63cef5cb6285889527bd6a67c0e1c2a9/raw}
+export RHDH_HELM_REPO=${RHDH_HELM_REPO:-https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/rhdh-1.4-rhel-9/installation}
 export RHDH_HELM_RELEASE_NAME=${RHDH_HELM_RELEASE_NAME:-rhdh}
 export RHDH_HELM_CHART=${RHDH_HELM_CHART:-developer-hub}
 export RHDH_NAMESPACE=${RHDH_NAMESPACE:-rhdh-performance}

diff --git a/test.env b/test.env
@@ -25,7 +25,7 @@
 ## RHDH installed via Helm
 # export RHDH_INSTALL_METHOD=helm
 # export RHDH_NAMESPACE=rhdh-performance-helm
-# export RHDH_HELM_REPO=https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/rhdh-1.3-rhel-9/installation
+# export RHDH_HELM_REPO=https://raw.githubusercontent.com/rhdh-bot/openshift-helm-charts/rhdh-1.4-rhel-9/installation
 # export RHDH_HELM_CHART=redhat-developer-hub
 # export RHDH_HELM_CHART_VERSION=
 # export RHDH_HELM_RELEASE_NAME=rhdh
@@ -38,7 +38,7 @@
 # export RHDH_INSTALL_METHOD=olm
 # export RHDH_NAMESPACE=rhdh-performance-olm
 # export RHDH_OPERATOR_NAMESPACE=rhdh-operator
-# export RHDH_OLM_INDEX_IMAGE=quay.io/rhdh/iib:1.3-v4.15-x86_64
+# export RHDH_OLM_INDEX_IMAGE=quay.io/rhdh/iib:1.4-v4.15-x86_64
 # export RHDH_OLM_CHANNEL=fast
 
 ## RHDH horizontal scaling