Fix PR check Jenkinsfile to use 'che-e2e' image (#14387)

Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Use eclipse/che-e2e:nightly to run Happy path tests on Jenkins CI Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Decrease Happy path tests execution build timeout to 20 minutes Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Use bujhtr5555/che-e2e:latest to check fixup Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Fix che start command Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Update screencatcher in the e2e folder for avoiding errors (#14394) * Fix mistake in the "activateBreakpoint" method Signed-off-by: Ihor Okhrimenko <iokhrime@redhat.com> * Rework method for enabling debug breakpoint Signed-off-by: Ihor Okhrimenko <iokhrime@redhat.com> * Cleanup code Signed-off-by: Ihor Okhrimenko <iokhrime@redhat.com> * Run tests from docker image Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Run local tests mounted to docker image Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Check tests with cypress/browsers:node8.9.3-chrome73 Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * check with eclipse/che-e2e:nightly Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Run tests from inside eclipse/che-e2e:nightly Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Check local e2e tests Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Pre-pull eclipse/che-e2e:nightly Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com> * Check local tests with updated eclipse/che-e2e:nightly Signed-off-by: Dmytro Nochevnov <dnochevn@redhat.com>
eclipse-che · Sep 6, 2019 · bc90020 · bc90020
1 parent c52045f
commit bc90020
Showing 1 changed file with 9 additions and 22 deletions.
diff --git a/e2e/jenkins/crw-ci/pr-check/k8s/Jenkinsfile b/e2e/jenkins/crw-ci/pr-check/k8s/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
 
     options {
         timestamps()
-        timeout(time: 40, unit: 'MINUTES')
+        timeout(time: 20, unit: 'MINUTES')
         buildDiscarder(logRotator(artifactDaysToKeepStr: '',
                 artifactNumToKeepStr: '', daysToKeepStr: '60', numToKeepStr: '100'))
     }
@@ -149,32 +149,19 @@ pipeline {
         stage("Run E2E Happy path tests") {
             steps {
                 script {
-                    // TO-DO (#14171) switch to eclipse/che-e2e image
-//                    sh """
-//                         CHE_HOST=\$(kubectl get ingress che-ingress -n=che -o=jsonpath={'.spec.rules[0].host'})
-//                         CHE_URL=http://\${CHE_HOST}
-//                         docker run --shm-size=256m --net=host --ipc=host \\
-//                           -e TS_SELENIUM_HEADLESS='true' \\
-//                           -e TS_SELENIUM_DEFAULT_TIMEOUT=300000 \\
-//                           -e TS_SELENIUM_LOAD_PAGE_TIMEOUT=240000 \\
-//                           -e TS_SELENIUM_WORKSPACE_STATUS_POLLING=20000 \\
-//                           -e TS_SELENIUM_BASE_URL=\${CHE_URL} \\
-//                           -v ${WORKSPACE}/e2e:/root/local_tests:Z \\
-//                           eclipse/che-e2e:nightly
-//                     """
-
                     sh """
-                        CHE_HOST=\$(kubectl get ingress che-ingress -n=che -o=jsonpath={'.spec.rules[0].host'})
-                        CHE_URL=http://\${CHE_HOST}
-                        docker run --net=host --ipc=host \\
+                         docker pull eclipse/che-e2e:nightly
+                         
+                         CHE_HOST=\$(kubectl get ingress che-ingress -n=che -o=jsonpath={'.spec.rules[0].host'})
+                         CHE_URL=http://\${CHE_HOST}
+                         docker run --shm-size=256m --net=host --ipc=host \\
                            -e TS_SELENIUM_HEADLESS='true' \\
                            -e TS_SELENIUM_DEFAULT_TIMEOUT=300000 \\
                            -e TS_SELENIUM_LOAD_PAGE_TIMEOUT=240000 \\
-                           -e TS_SELENIUM_BASE_URL=\${CHE_URL} \\
                            -e TS_SELENIUM_WORKSPACE_STATUS_POLLING=20000 \\
-                           -w /home/e2e \\
-                           -v $WORKSPACE:/home:Z \\
-                           cypress/browsers:node8.9.3-chrome73 bash -c "npm install &&  npm run test-happy-path"
+                           -e TS_SELENIUM_BASE_URL=\${CHE_URL} \\
+                           -v ${WORKSPACE}/e2e:/tmp/e2e:Z \\
+                           eclipse/che-e2e:nightly
                     """
                 }
             }