diff --git a/tests/.infra/crw-ci/nightly/k8s/Jenkinsfile b/tests/.infra/crw-ci/nightly/k8s/Jenkinsfile index 22672cee03..5663a74ccf 100644 --- a/tests/.infra/crw-ci/nightly/k8s/Jenkinsfile +++ b/tests/.infra/crw-ci/nightly/k8s/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { parameters { string(name: 'emails', - defaultValue: 'dnochevn@redhat.com', + defaultValue: 'dnochevn@redhat.com,kfoniok@redhat.com', description: 'Comma-separated list of emails to send results') } diff --git a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile index 087213ccb0..e62b1ef06e 100644 --- a/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile +++ b/tests/.infra/crw-ci/pr-check/k8s/Jenkinsfile @@ -203,60 +203,64 @@ pipeline { stage("Start Che") { steps { - echo "Patch Che custom-resource.yaml" - sh """ - sed -i "s|cheImage: ''|cheImage: '${cheImageRepo}'|" $CUSTOM_RESOURCE_FILE_PATH - sed -i "s|cheImageTag: 'nightly'|cheImageTag: '${mutableCheImageTag}'|" $CUSTOM_RESOURCE_FILE_PATH - - sed -i "s|cheLogLevel: INFO|cheLogLevel: DEBUG|" $CUSTOM_RESOURCE_FILE_PATH - - sed -i "s|ingressDomain: '192.168.99.101.nip.io'|ingressDomain: '\$(minikube ip).nip.io'|" $CUSTOM_RESOURCE_FILE_PATH - """ - - echo "Install Che" - sh """ - ${WORKSPACE}/chectl server:start \\ - --k8spodreadytimeout=180000 \\ - --installer=operator \\ - --listr-renderer=verbose \\ - --platform=minikube \\ - --che-operator-cr-yaml=$CUSTOM_RESOURCE_FILE_PATH - """ - script { - cheHost = sh( - script: "kubectl get ingress che -n=che -o=jsonpath={'.spec.rules[0].host'}", - returnStdout: true - ).trim() - } + echo "Patch Che custom-resource.yaml" + sh """ + sed -i "s|cheImage: ''|cheImage: '${cheImageRepo}'|" $CUSTOM_RESOURCE_FILE_PATH + sed -i "s|cheImageTag: 'nightly'|cheImageTag: '${ + mutableCheImageTag + }'|" $CUSTOM_RESOURCE_FILE_PATH + + sed -i "s|cheLogLevel: INFO|cheLogLevel: DEBUG|" $CUSTOM_RESOURCE_FILE_PATH + + sed -i "s|ingressDomain: '192.168.99.101.nip.io'|ingressDomain: '\$(minikube ip).nip.io'|" $CUSTOM_RESOURCE_FILE_PATH + """ - echo "Wait che-server to be available" - sh """ - COUNTER=0; - SUCCESS_RATE_COUNTER=0; - while true; do - if [ \$COUNTER -gt 180 ]; then - echo "Unable to get stable route. Exiting" - exit 1 - fi - - ((COUNTER+=1)) - - - STATUS_CODE=\$(curl -sL -w "%{http_code}" -I ${cheHost} -o /dev/null; true) || true - - echo "Try \${COUNTER}. Status code: \${STATUS_CODE}" - if [ "\$STATUS_CODE" == "200" ]; then - ((SUCCESS_RATE_COUNTER+=1)) - fi - sleep 1; - - if [ \$SUCCESS_RATE_COUNTER == \$SUCCESS_THRESHOLD ]; then - echo "Route is stable enough. Continuing running tests" - break - fi - done - """ + retry(2) { + echo "Install Che" + sh """ + ${WORKSPACE}/chectl server:start \\ + --k8spodreadytimeout=180000 \\ + --installer=operator \\ + --listr-renderer=verbose \\ + --platform=minikube \\ + --che-operator-cr-yaml=$CUSTOM_RESOURCE_FILE_PATH + """ + + cheHost = sh( + script: "kubectl get ingress che -n=che -o=jsonpath={'.spec.rules[0].host'}", + returnStdout: true + ).trim() + + echo "Wait che-server to be available" + sh """ + COUNTER=0; + SUCCESS_RATE_COUNTER=0; + while true; do + if [ \$COUNTER -gt 180 ]; then + echo "Unable to get stable route. Exiting" + exit 1 + fi + + ((COUNTER+=1)) + + + STATUS_CODE=\$(curl -sL -w "%{http_code}" -I ${cheHost} -o /dev/null; true) || true + + echo "Try \${COUNTER}. Status code: \${STATUS_CODE}" + if [ "\$STATUS_CODE" == "200" ]; then + ((SUCCESS_RATE_COUNTER+=1)) + fi + sleep 1; + + if [ \$SUCCESS_RATE_COUNTER == \$SUCCESS_THRESHOLD ]; then + echo "Route is stable enough. Continuing running tests" + break + fi + done + """ + } + } } } diff --git a/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/ProjectStateAfterRefreshTest.java b/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/ProjectStateAfterRefreshTest.java index df1e16f6b7..014d9e9d56 100644 --- a/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/ProjectStateAfterRefreshTest.java +++ b/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/ProjectStateAfterRefreshTest.java @@ -12,7 +12,6 @@ package org.eclipse.che.selenium.workspaces; import static org.eclipse.che.commons.lang.NameGenerator.generate; -import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.pageobject.dashboard.ProjectSourcePage.Template.CONSOLE_JAVA_SIMPLE; import com.google.inject.Inject; @@ -34,7 +33,7 @@ import org.testng.annotations.Test; * @author Andrey chizhikov TODO turn on the test after https://github.com/eclipse/che/issues/15317 * resolved */ -@Test(groups = UNDER_REPAIR) +@Test public class ProjectStateAfterRefreshTest { private static final String WORKSPACE_NAME = generate(ProjectStateAfterRefreshTest.class.getSimpleName(), 5); diff --git a/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/ProjectStateAfterRenameWorkspaceTest.java b/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/ProjectStateAfterRenameWorkspaceTest.java index e064ddca7b..cadb84a3e1 100644 --- a/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/ProjectStateAfterRenameWorkspaceTest.java +++ b/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/ProjectStateAfterRenameWorkspaceTest.java @@ -12,7 +12,6 @@ package org.eclipse.che.selenium.workspaces; import static org.eclipse.che.commons.lang.NameGenerator.generate; -import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.pageobject.dashboard.ProjectSourcePage.Template.CONSOLE_JAVA_SIMPLE; import com.google.inject.Inject; @@ -36,7 +35,7 @@ import org.testng.annotations.Test; * @author Aleksandr Shmaraev TODO turn on the test after * https://github.com/eclipse/che/issues/15317 resolved */ -@Test(groups = UNDER_REPAIR) +@Test public class ProjectStateAfterRenameWorkspaceTest { private static final String WORKSPACE_NAME = generate(ProjectStateAfterRenameWorkspaceTest.class.getSimpleName(), 5);