Merge remote-tracking branch 'upstream/master' into che18404

Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
eclipse-che · Nov 26, 2020 · 96999b3 · 96999b3
2 parents 61a0640 + c366ed6
commit 96999b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/tests/.infra/centos-ci/common-qe/che-util.sh b/tests/.infra/centos-ci/common-qe/che-util.sh
@@ -44,7 +44,7 @@ function createServerPatchFile(){
 function startCheServer(){
     createServerPatchFile "$1"
 
-    if chectl server:start --listr-renderer=verbose -a operator -p openshift --k8spodreadytimeout=360000 --che-operator-cr-patch-yaml=/tmp/che-cr-patch.yaml --chenamespace=eclipse-che; then
+    if chectl server:deploy --listr-renderer=verbose -a operator -p openshift --k8spodreadytimeout=600000 --k8spodwaittimeout=600000 --k8spoddownloadimagetimeout=600000 --che-operator-cr-patch-yaml=/tmp/che-cr-patch.yaml --chenamespace=eclipse-che; then
         echo "Started successfully"
         oc get checluster -o yaml
     else

diff --git a/tests/.infra/centos-ci/functional_tests_utils.sh b/tests/.infra/centos-ci/functional_tests_utils.sh
@@ -271,7 +271,7 @@ function getOpenshiftLogs() {
 
 function deployCheIntoCluster() {
   echo "======== Start to install CHE ========"
-  if chectl server:start --listr-renderer=verbose -a operator -p minishift --k8spodreadytimeout=360000 $1 --chenamespace=eclipse-che; then
+  if chectl server:deploy --listr-renderer=verbose -a operator -p minishift --k8spodreadytimeout=600000 --k8spodwaittimeout=600000 --k8spoddownloadimagetimeout=600000 $1 --chenamespace=eclipse-che; then
     echo "Started successfully"
     oc get checluster -o yaml
   else

diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile
@@ -286,8 +286,10 @@ EOL"""
 
                     echo "Install Che"
                     sh """
-                        ${pathToChectl} server:start \\
-                        --k8spodreadytimeout=180000 \\
+                        ${pathToChectl} server:deploy \\
+                        --k8spodreadytimeout=600000 \\
+                        --k8spodwaittimeout=600000 \\
+                        --k8spoddownloadimagetimeout=600000 \\
                         --listr-renderer=verbose \\
                         --platform=minikube \\
                         --che-operator-cr-patch-yaml=$CUSTOM_RESOURCE_PATCH_FILE \\
@@ -428,6 +430,7 @@ EOL"""
                 ${pathToChectl} --help > $LOGS_AND_CONFIGS/chectl.version.txt || true
 
                 cp -r /tmp/chectl-logs $LOGS_AND_CONFIGS || true
+                cp /home/hudson/.cache/chectl/error.log /tmp/chectl-logs || true
             """
 
             archiveArtifacts allowEmptyArchive: true, artifacts: "tests/e2e/report/**, logs-and-configs/**"