From 2051a0ae104d1729aa074d363b8193c758772929 Mon Sep 17 00:00:00 2001
From: Dmytro Nochevnov <dnochevn@redhat.com>
Date: Tue, 16 Mar 2021 19:03:40 +0200
Subject: [PATCH] Stabilize PR Happy path testing pipelines (#19293)

* Stabilize dependencies installation in PR Happy path testing pipelines
* Increase start workspace timeout

Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com>
---
 .../.infra/centos-ci/functional_tests_utils.sh  |  6 ++----
 .../nightly/cico-openshift-connector-test.sh    | 10 +++++++---
 .../centos-ci/nightly/nightly-happypath-test.sh |  3 +++
 .../crw-ci/dashboard-next/pr-check/Jenkinsfile  | 17 ++++++++++-------
 tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile    | 17 ++++++++++-------
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/tests/.infra/centos-ci/functional_tests_utils.sh b/tests/.infra/centos-ci/functional_tests_utils.sh
index 6296896ff7..4e73e7bf2b 100755
--- a/tests/.infra/centos-ci/functional_tests_utils.sh
+++ b/tests/.infra/centos-ci/functional_tests_utils.sh
@@ -333,13 +333,11 @@ createTestWorkspaceAndRunTest() {
   ### Run tests
   docker run --shm-size=1g --net=host  --ipc=host -v $REPORT_FOLDER:/tmp/e2e/report:Z \
   -e TS_SELENIUM_BASE_URL="https://$CHE_ROUTE" \
-  -e TS_SELENIUM_LOG_LEVEL=DEBUG \
   -e TS_SELENIUM_MULTIUSER=true \
   -e TS_SELENIUM_USERNAME="admin" \
   -e TS_SELENIUM_PASSWORD="admin" \
-  -e TS_SELENIUM_DEFAULT_TIMEOUT=300000 \
-  -e TS_SELENIUM_WORKSPACE_STATUS_POLLING=20000 \
-  -e TS_SELENIUM_LOAD_PAGE_TIMEOUT=420000 \
+  -e TS_SELENIUM_LOG_LEVEL=TRACE \
+  -e TS_SELENIUM_START_WORKSPACE_TIMEOUT=720000 \
   -e NODE_TLS_REJECT_UNAUTHORIZED=0 \
   quay.io/eclipse/che-e2e:nightly || IS_TESTS_FAILED=true
 }
diff --git a/tests/.infra/centos-ci/nightly/cico-openshift-connector-test.sh b/tests/.infra/centos-ci/nightly/cico-openshift-connector-test.sh
index 962c8fe802..e925076515 100755
--- a/tests/.infra/centos-ci/nightly/cico-openshift-connector-test.sh
+++ b/tests/.infra/centos-ci/nightly/cico-openshift-connector-test.sh
@@ -21,7 +21,6 @@ function runOpenshiftConnectorTest(){
     -e TS_SELENIUM_LOAD_PAGE_TIMEOUT=420000 \
     -e TS_SELENIUM_WORKSPACE_STATUS_POLLING=20000 \
     -e TS_SELENIUM_BASE_URL="https://$CHE_ROUTE" \
-    -e TS_SELENIUM_LOG_LEVEL=DEBUG \
     -e TS_SELENIUM_USERNAME=${TEST_USERNAME} \
     -e TS_SELENIUM_PASSWORD=${TEST_USERNAME} \
     -e TS_TEST_OPENSHIFT_PLUGIN_USERNAME=developer \
@@ -30,9 +29,11 @@ function runOpenshiftConnectorTest(){
     -e TS_TEST_OPENSHIFT_PLUGIN_COMPONENT_TYPE="nodejs (s2i)" \
     -e TS_TEST_OPENSHIFT_PLUGIN_COMPONENT_VERSION=latest \
     -e TS_SELENIUM_MULTIUSER=true \
-    -e DELETE_WORKSPACE_ON_FAILED_TEST=true \
-    -e TEST_SUITE=test-openshift-connector \
     -e NODE_TLS_REJECT_UNAUTHORIZED=0 \
+    -e DELETE_WORKSPACE_ON_FAILED_TEST=true \
+    -e TS_SELENIUM_LOG_LEVEL=TRACE \
+    -e TS_SELENIUM_START_WORKSPACE_TIMEOUT=720000 \
+    -e TEST_SUITE=test-openshift-connector \
      quay.io/eclipse/che-e2e:nightly || IS_TESTS_FAILED=true
     
 }
@@ -41,6 +42,9 @@ function runOpenshiftConnectorTest(){
 function prepareCustomResourcePatchFile() {
   cat > /tmp/custom-resource-patch.yaml <<EOL
 spec:
+  server:
+    customCheProperties:
+      CHE_INFRA_KUBERNETES_WORKSPACE_START_TIMEOUT_MIN: '12'
   auth:
     updateAdminPassword: false
     openShiftoAuth: false
diff --git a/tests/.infra/centos-ci/nightly/nightly-happypath-test.sh b/tests/.infra/centos-ci/nightly/nightly-happypath-test.sh
index ccb24033a9..888a419331 100755
--- a/tests/.infra/centos-ci/nightly/nightly-happypath-test.sh
+++ b/tests/.infra/centos-ci/nightly/nightly-happypath-test.sh
@@ -13,6 +13,9 @@ source tests/.infra/centos-ci/functional_tests_utils.sh
 function prepareCustomResourcePatchFile() {
   cat > /tmp/custom-resource-patch.yaml <<EOL
 spec:
+  server:
+    customCheProperties:
+      CHE_INFRA_KUBERNETES_WORKSPACE_START_TIMEOUT_MIN: '12'
   auth:
     updateAdminPassword: false
     openShiftoAuth: false
diff --git a/tests/.infra/crw-ci/dashboard-next/pr-check/Jenkinsfile b/tests/.infra/crw-ci/dashboard-next/pr-check/Jenkinsfile
index a8a5302201..d661a552fa 100644
--- a/tests/.infra/crw-ci/dashboard-next/pr-check/Jenkinsfile
+++ b/tests/.infra/crw-ci/dashboard-next/pr-check/Jenkinsfile
@@ -142,16 +142,16 @@ pipeline {
                         echo "Install dependencies needed for build of Eclipse Che"
                         sh """
                             # workaround https://github.com/eclipse/che/issues/19093
-                            for i in {1..12} 
+                            for i in {1..30} 
                             do
-                                echo "-- ITERATION \$i --"
+                                echo "-- ATTEMPT \$i --"
                                 sudo yum install -y glibc.i686 libfontconfig.so.1 libstdc++-devel.i686 \\
                                     --disablerepo=rhel-7-server-extras-os-rpms,rhel-7-server-ose-3.4-os-rpms,rhel-7-server-optional-os-rpms || true
+                                
+                                sudo yum list installed | grep "glibc.i686" && sudo yum list installed | grep "fontconfig.i686" && sudo yum list installed | grep "libstdc++-devel.i686" && break
+                                
+                                sleep 5
                             done
-                            
-                            sudo yum list installed | grep "glibc.i686"
-                            sudo yum list installed | grep "fontconfig.i686"
-                            sudo yum list installed | grep "libstdc++-devel.i686"
                         """
 
                         echo "Build branch ${ghprbSourceBranch} of upstream projects"
@@ -282,6 +282,7 @@ spec:
       CHE_WORKSPACE_SIDECAR_IMAGE__PULL__POLICY: IfNotPresent
       CHE_WORKSPACE_PLUGIN__BROKER_PULL__POLICY: IfNotPresent
       CHE_INFRA_KUBERNETES_WORKSPACE__UNRECOVERABLE__EVENTS: 'Failed Scheduling,Failed to pull image'
+      CHE_INFRA_KUBERNETES_WORKSPACE_START_TIMEOUT_MIN: '12'
   k8s:  
     singleHostExposureType: 'gateway'
   auth:
@@ -299,6 +300,7 @@ spec:
       CHE_WORKSPACE_SIDECAR_IMAGE__PULL__POLICY: IfNotPresent
       CHE_WORKSPACE_PLUGIN__BROKER_PULL__POLICY: IfNotPresent
       CHE_INFRA_KUBERNETES_WORKSPACE__UNRECOVERABLE__EVENTS: 'Failed Scheduling,Failed to pull image'
+      CHE_INFRA_KUBERNETES_WORKSPACE_START_TIMEOUT_MIN: '12'
   auth:
     updateAdminPassword: false
 EOL"""
@@ -370,9 +372,10 @@ EOL"""
                        -e TS_SELENIUM_PASSWORD="admin" \\
                        -e TEST_SUITE="test-all-devfiles" ${e2eTestParameters} \\
                        -e NODE_TLS_REJECT_UNAUTHORIZED=0 \\
+                       -e TS_SELENIUM_LOG_LEVEL=TRACE \\
                        -e TS_SELENIUM_DEFAULT_POLLING=2000 \\
-                       -e USERSTORY=DevfileSmoke \\
                        -e TS_SELENIUM_START_WORKSPACE_TIMEOUT=720000 \\
+                       -e USERSTORY=DevfileSmoke \\
                        -v ${WORKSPACE}/tests/e2e:/tmp/e2e:Z \\
                        quay.io/eclipse/che-e2e:${cheE2eImageTag}
                 """
diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile
index 8f381f076c..27ac1d40b5 100644
--- a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile
+++ b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile
@@ -163,16 +163,16 @@ pipeline {
                         echo "Install dependencies needed for build of Eclipse Che"
                         sh """
                             # workaround https://github.com/eclipse/che/issues/19093
-                            for i in {1..12} 
+                            for i in {1..30} 
                             do
-                                echo "-- ITERATION \$i --"
+                                echo "-- ATTEMPT \$i --"
                                 sudo yum install -y glibc.i686 libfontconfig.so.1 libstdc++-devel.i686 \\
                                     --disablerepo=rhel-7-server-extras-os-rpms,rhel-7-server-ose-3.4-os-rpms,rhel-7-server-optional-os-rpms || true
+                                
+                                sudo yum list installed | grep "glibc.i686" && sudo yum list installed | grep "fontconfig.i686" && sudo yum list installed | grep "libstdc++-devel.i686" && break
+                                
+                                sleep 5
                             done
-                            
-                            sudo yum list installed | grep "glibc.i686"
-                            sudo yum list installed | grep "fontconfig.i686"
-                            sudo yum list installed | grep "libstdc++-devel.i686"
                         """
 
                         echo "Build branch ${ghprbSourceBranch} of upstream projects"
@@ -272,6 +272,7 @@ spec:
       CHE_LIMITS_USER_WORKSPACES_RUN_COUNT: '-1'
       CHE_WORKSPACE_SIDECAR_IMAGE__PULL__POLICY: IfNotPresent
       CHE_WORKSPACE_PLUGIN__BROKER_PULL__POLICY: IfNotPresent
+      CHE_INFRA_KUBERNETES_WORKSPACE_START_TIMEOUT_MIN: '12'
   k8s:  
     singleHostExposureType: 'gateway'
   auth:
@@ -288,6 +289,7 @@ spec:
       CHE_LIMITS_USER_WORKSPACES_RUN_COUNT: '-1'
       CHE_WORKSPACE_SIDECAR_IMAGE__PULL__POLICY: IfNotPresent
       CHE_WORKSPACE_PLUGIN__BROKER_PULL__POLICY: IfNotPresent
+      CHE_INFRA_KUBERNETES_WORKSPACE_START_TIMEOUT_MIN: '12'
   auth:
     updateAdminPassword: false
 EOL"""
@@ -381,7 +383,8 @@ EOL"""
                        -e TS_SELENIUM_PASSWORD="admin" \\
                        -e TEST_SUITE="${e2eTestToRun}" ${e2eTestParameters} \\
                        -e NODE_TLS_REJECT_UNAUTHORIZED=0 \\
-                       -e TS_SELENIUM_LOG_LEVEL="TRACE" \\
+                       -e TS_SELENIUM_LOG_LEVEL=TRACE \\
+                       -e TS_SELENIUM_START_WORKSPACE_TIMEOUT=720000 \\
                        -v ${WORKSPACE}/tests/e2e:/tmp/e2e:Z \\
                        quay.io/eclipse/che-e2e:${cheE2eImageTag}
                 """