Merge branch 'main' into refactor/release-scripts

Author: skestwal

ci-scripts/collect-results.sh

@@ -24,6 +24,7 @@ RHDH_INSTALL_METHOD="${RHDH_INSTALL_METHOD:-helm}"
 LOCUST_NAMESPACE="${LOCUST_NAMESPACE:-locust-operator}"
 RHDH_METRIC="${RHDH_METRIC:-true}"
 PSQL_EXPORT="${PSQL_EXPORT:-false}"
+ENABLE_ORCHESTRATOR="${ENABLE_ORCHESTRATOR:-false}"
 
 cli="oc"
 clin="$cli -n $RHDH_NAMESPACE"

ci-scripts/rhdh-setup/template/backstage/app-config.yaml

@@ -27,7 +27,7 @@ catalog:
           timeout: 
             minutes: 1
           initialDelay: 
-            seconds: 15
+            minutes: 1
 techdocs:
   builder: local
   generator: