From bc900205dfd7f84320195ef883166e4643976407 Mon Sep 17 00:00:00 2001 From: Dmytro Nochevnov Date: Fri, 6 Sep 2019 14:13:39 +0300 Subject: [PATCH] Fix PR check Jenkinsfile to use 'che-e2e' image (#14387) Signed-off-by: Dmytro Nochevnov * Use eclipse/che-e2e:nightly to run Happy path tests on Jenkins CI Signed-off-by: Dmytro Nochevnov * Decrease Happy path tests execution build timeout to 20 minutes Signed-off-by: Dmytro Nochevnov * Use bujhtr5555/che-e2e:latest to check fixup Signed-off-by: Dmytro Nochevnov * Fix che start command Signed-off-by: Dmytro Nochevnov * Update screencatcher in the e2e folder for avoiding errors (#14394) * Fix mistake in the "activateBreakpoint" method Signed-off-by: Ihor Okhrimenko * Rework method for enabling debug breakpoint Signed-off-by: Ihor Okhrimenko * Cleanup code Signed-off-by: Ihor Okhrimenko * Run tests from docker image Signed-off-by: Dmytro Nochevnov * Run local tests mounted to docker image Signed-off-by: Dmytro Nochevnov * Check tests with cypress/browsers:node8.9.3-chrome73 Signed-off-by: Dmytro Nochevnov * check with eclipse/che-e2e:nightly Signed-off-by: Dmytro Nochevnov * Run tests from inside eclipse/che-e2e:nightly Signed-off-by: Dmytro Nochevnov * Check local e2e tests Signed-off-by: Dmytro Nochevnov * Pre-pull eclipse/che-e2e:nightly Signed-off-by: Dmytro Nochevnov * Check local tests with updated eclipse/che-e2e:nightly Signed-off-by: Dmytro Nochevnov --- e2e/jenkins/crw-ci/pr-check/k8s/Jenkinsfile | 31 ++++++--------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/e2e/jenkins/crw-ci/pr-check/k8s/Jenkinsfile b/e2e/jenkins/crw-ci/pr-check/k8s/Jenkinsfile index 48ae5c54f6..ee37196cc3 100644 --- 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 """ } }