diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile index 8910082a42..087213ccb0 100644 --- a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile +++ b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile @@ -86,44 +86,52 @@ pipeline { parallel { stage("Download chectl") { steps { - // TO-DO use option "--install-path" https://github.com/eclipse/che/pull/14182 - sh """ - curl -sL https://www.eclipse.org/che/chectl/ > install_chectl.sh - chmod +x install_chectl.sh - sudo PATH=$PATH ./install_chectl.sh --channel=next - sudo mv /usr/local/bin/chectl ${WORKSPACE}/chectl - sudo chmod +x ${WORKSPACE}/chectl - """ + script { + retry(2) { + // TO-DO use option "--install-path" https://github.com/eclipse/che/pull/14182 + sh """ + curl -sL https://www.eclipse.org/che/chectl/ > install_chectl.sh + chmod +x install_chectl.sh + sudo PATH=$PATH ./install_chectl.sh --channel=next + sudo mv /usr/local/bin/chectl ${WORKSPACE}/chectl + sudo chmod +x ${WORKSPACE}/chectl + """ + } + } } } stage("Start Kubernetes") { steps { - echo "Workaround k8s error https://github.com/eclipse/che/issues/14902" - sh """ - cat /etc/sysctl.conf - echo "net.bridge.bridge-nf-call-iptables = 1" | sudo tee -a /etc/sysctl.conf - sudo sysctl -p - """ + script { + retry(2) { + echo "Workaround k8s error https://github.com/eclipse/che/issues/14902" + sh """ + cat /etc/sysctl.conf + echo "net.bridge.bridge-nf-call-iptables = 1" | sudo tee -a /etc/sysctl.conf + sudo sysctl -p + """ - sh """ - # https://github.com/kubernetes/minikube/blob/master/docs/vmdriver-none.md - export MINIKUBE_WANTUPDATENOTIFICATION=false - export MINIKUBE_WANTREPORTERRORPROMPT=false - export MINIKUBE_HOME=\$HOME - export CHANGE_MINIKUBE_NONE_USER=true - export KUBECONFIG=\$HOME/.kube/config - export DOCKER_CONFIG=\$HOME/.docker + sh """ + # https://github.com/kubernetes/minikube/blob/master/docs/vmdriver-none.md + export MINIKUBE_WANTUPDATENOTIFICATION=false + export MINIKUBE_WANTREPORTERRORPROMPT=false + export MINIKUBE_HOME=\$HOME + export CHANGE_MINIKUBE_NONE_USER=true + export KUBECONFIG=\$HOME/.kube/config + export DOCKER_CONFIG=\$HOME/.docker - mkdir -p \$HOME/.kube \$HOME/.minikube - touch \$KUBECONFIG + mkdir -p \$HOME/.kube \$HOME/.minikube + touch \$KUBECONFIG - sudo -E /usr/local/bin/minikube start \\ - --vm-driver=none \\ - --cpus 4 \\ - --memory 13000 \\ - --logtostderr - """ + sudo -E /usr/local/bin/minikube start \\ + --vm-driver=none \\ + --cpus 4 \\ + --memory 13000 \\ + --logtostderr + """ + } + } } } @@ -160,6 +168,19 @@ pipeline { sh "mvn clean install -f ${WORKSPACE}/pom.xml -T 4 -U -DskipTests -Dskip-enforce -Dskip-validate-sources" } } + + stage("Pull test images") { + steps { + script { + retry(2) { + sh """ + docker pull quay.io/eclipse/che-e2e:nightly + docker pull quay.io/eclipse/happy-path:nightly + """ + } + } + } + } } } @@ -274,9 +295,7 @@ pipeline { stage("Run E2E Happy path tests") { steps { - sh """ - docker pull eclipse/che-e2e:nightly - + sh """ CHE_URL=http://${cheHost} docker run --shm-size=1g --net=host --ipc=host \\ -p 5920:5920 \\ diff --git a/tests/e2e/TestConstants.ts b/tests/e2e/TestConstants.ts index e352b1e9ca..c6fe624eee 100644 --- a/tests/e2e/TestConstants.ts +++ b/tests/e2e/TestConstants.ts @@ -47,7 +47,7 @@ export const TestConstants = { /** * Timeout in milliseconds waiting for workspace start, "240 000" by default. */ - TS_SELENIUM_START_WORKSPACE_TIMEOUT: Number(process.env.TS_SELENIUM_START_WORKSPACE_TIMEOUT) || 240000, + TS_SELENIUM_START_WORKSPACE_TIMEOUT: Number(process.env.TS_SELENIUM_START_WORKSPACE_TIMEOUT) || 360000, /** * Timeout in milliseconds waiting for page load, "120 000" by default.