From c366ed6a88b265a49f754f99f8f21f9d3cac7e06 Mon Sep 17 00:00:00 2001
From: Dmytro Nochevnov <dnochevn@redhat.com>
Date: Thu, 26 Nov 2020 02:24:20 +0200
Subject: [PATCH] Replace 'server:start' with 'server:deploy' in E2E tests
 (#18461)

* Replace 'server:start' with 'server:deploy' in E2E tests
* use '-k8spodwaittimeout' option when deploy Che
* Use '--k8spoddownloadimagetimeout' option when deploy Che

Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com>
---
 tests/.infra/centos-ci/common-qe/che-util.sh     | 2 +-
 tests/.infra/centos-ci/functional_tests_utils.sh | 2 +-
 tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile     | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/.infra/centos-ci/common-qe/che-util.sh b/tests/.infra/centos-ci/common-qe/che-util.sh
index 42167a3fc9..f829abf9b9 100755
--- 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
index b22884e0fa..9970cae06b 100755
--- 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
index 74a57860e8..ede4faddcd 100644
--- 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/**"