From a917c097f0219a2741c1e130adc57c17dbfeb9a0 Mon Sep 17 00:00:00 2001 From: flacatus Date: Thu, 28 May 2020 11:24:58 +0200 Subject: [PATCH 1/3] Increase che installation time Signed-off-by: flacatus --- .ci/start-minikube.sh | 3 +++ olm/olm.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.ci/start-minikube.sh b/.ci/start-minikube.sh index 2a93cc9d3..ebd02b1a9 100644 --- a/.ci/start-minikube.sh +++ b/.ci/start-minikube.sh @@ -52,6 +52,9 @@ minikube version # minikube start minikube start --kubernetes-version=$KUBERNETES_VERSION --extra-config=apiserver.authorization-mode=RBAC +# Add minikube ingress +minikube addons enable ingress + # waiting for node(s) to be ready JSONPATH='{range .items[*]}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}'; until kubectl get nodes -o jsonpath="$JSONPATH" 2>&1 | grep -q "Ready=True"; do sleep 1; done diff --git a/olm/olm.sh b/olm/olm.sh index 8d449419a..620a89f30 100755 --- a/olm/olm.sh +++ b/olm/olm.sh @@ -215,7 +215,7 @@ waitCheServerDeploy() { echo "Waiting for Che server to be deployed" i=0 - while [ $i -le 360 ] + while [ $i -le 480 ] do status=$(kubectl get checluster/eclipse-che -n "${namespace}" -o jsonpath={.status.cheClusterRunning}) if [ "${status}" == "Available" ] @@ -226,9 +226,9 @@ waitCheServerDeploy() { ((i++)) done - if [ $i -gt 360 ] + if [ $i -gt 480 ] then - echo "Che server did't start after 6 minutes" + echo "Che server did't start after 8 minutes" exit 1 fi } From 57b3282bc7893506e70de5172838673db7618055 Mon Sep 17 00:00:00 2001 From: flacatus Date: Thu, 28 May 2020 11:25:52 +0200 Subject: [PATCH 2/3] Increase che installation time and olm install Signed-off-by: flacatus --- olm/olm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/olm/olm.sh b/olm/olm.sh index 620a89f30..12de4849e 100755 --- a/olm/olm.sh +++ b/olm/olm.sh @@ -123,7 +123,7 @@ EOF applyCheOperatorSource i=0 - while [ $i -le 120 ] + while [ $i -le 240 ] do if kubectl get catalogsource/"${packageName}" -n "${marketplaceNamespace}" >/dev/null 2>&1 then @@ -133,9 +133,9 @@ EOF ((i++)) done - if [ $i -gt 120 ] + if [ $i -gt 240 ] then - echo "Catalog source not created after 2 minutes" + echo "Catalog source not created after 4 minutes" exit 1 fi if [ "${SOURCE_INSTALL}" == "Marketplace" ]; then From 71abd390736b8e91814ba48373cc970fdb520cc3 Mon Sep 17 00:00:00 2001 From: flacatus Date: Thu, 28 May 2020 11:43:53 +0200 Subject: [PATCH 3/3] Fixx Signed-off-by: flacatus --- .ci/cico_updates_minikube.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/cico_updates_minikube.sh b/.ci/cico_updates_minikube.sh index 2fa1eddd5..8f1aca9dc 100644 --- a/.ci/cico_updates_minikube.sh +++ b/.ci/cico_updates_minikube.sh @@ -25,7 +25,6 @@ catchFinish() { getCheClusterLogs archiveArtifacts "che-operator-minikube-updates" fi - minikube delete && yes | kubeadm reset rm -rf ~/.kube ~/.minikube exit $result }