diff --git a/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json b/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json index 91da42fdf9d..4ee687c3fef 100644 --- a/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json +++ b/assembly/assembly-wsmaster-war/src/main/resources/che-in-che.json @@ -24,7 +24,7 @@ ], "source": { "type": "image", - "origin": "eclipse/che-dev:che6" + "origin": "eclipse/che-dev:nightly" }, "workspaceConfig": { "environments": { @@ -68,7 +68,7 @@ } }, "recipe": { - "location": "eclipse/che-dev:che6", + "location": "eclipse/che-dev:nightly", "type": "dockerimage" } } diff --git a/dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh b/dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh index 5c267bbafd0..5903f480113 100755 --- a/dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh +++ b/dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh @@ -8,11 +8,11 @@ # This script is meant for quick & easy install of Che on OpenShift via: # # ``` bash -# DEPLOY_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/che6/dockerfiles/cli/scripts/openshift/deploy_che.sh +# DEPLOY_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/master/dockerfiles/cli/scripts/openshift/deploy_che.sh # curl -fsSL ${DEPLOY_SCRIPT_URL} -o get-che.sh -# WAIT_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/che6/dockerfiles/cli/scripts/openshift/wait_until_che_is_available.sh +# WAIT_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/master/dockerfiles/cli/scripts/openshift/wait_until_che_is_available.sh # curl -fsSL ${WAIT_SCRIPT_URL} -o wait-che.sh -# STACKS_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/che6/dockerfiles/cli/scripts/openshift/replace_stacks.sh +# STACKS_SCRIPT_URL=https://raw.githubusercontent.com/eclipse/che/master/dockerfiles/cli/scripts/openshift/replace_stacks.sh # curl -fsSL ${STACKS_SCRIPT_URL} -o stacks-che.sh # bash get-che.sh && wait-che.sh && stacks-che.sh # ``` @@ -182,7 +182,7 @@ CHE_OPENSHIFT_PROJECT=${CHE_OPENSHIFT_PROJECT:-${DEFAULT_CHE_OPENSHIFT_PROJECT}} DEFAULT_COMMAND="deploy" DEFAULT_CHE_MULTIUSER="false" DEFAULT_CHE_IMAGE_REPO="docker.io/eclipse/che-server" -DEFAULT_CHE_IMAGE_TAG="che6" +DEFAULT_CHE_IMAGE_TAG="nightly" DEFAULT_CHE_KEYCLOAK_OSO_ENDPOINT="https://sso.openshift.io/auth/realms/fabric8/broker/openshift-v3/token" DEFAULT_KEYCLOAK_GITHUB_ENDPOINT="https://sso.openshift.io/auth/realms/fabric8/broker/github/token" diff --git a/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh b/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh index 4079e736775..2347350711f 100755 --- a/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh +++ b/dockerfiles/init/modules/openshift/files/scripts/multi-user/deploy_postgres_only.sh @@ -18,7 +18,7 @@ if [ "${CHE_EPHEMERAL}" == "true" ]; then oc delete pvc/postgres-data fi -IMAGE_INIT=${IMAGE_INIT:-"eclipse/che-init:che6"} +IMAGE_INIT=${IMAGE_INIT:-"eclipse/che-init:nightly"} oc create -f - <<-EOF diff --git a/selenium/che-selenium-core/bin/webdriver.sh b/selenium/che-selenium-core/bin/webdriver.sh index 32ff7fb6141..bebe6c8cd1f 100755 --- a/selenium/che-selenium-core/bin/webdriver.sh +++ b/selenium/che-selenium-core/bin/webdriver.sh @@ -519,9 +519,9 @@ fetchActualResults() { # define the URL of CI job to compare result with result on it if [[ ${CHE_MULTIUSER} == true ]]; then - local nameOfCIJob=che-multiuser-integration-tests-che6 + local nameOfCIJob=che-multiuser-integration-tests else - local nameOfCIJob=che-integration-tests-che6 + local nameOfCIJob=che-integration-tests fi [[ -z ${BASE_ACTUAL_RESULTS_URL+x} ]] && { BASE_ACTUAL_RESULTS_URL="https://ci.codenvycorp.com/view/qa/job/$nameOfCIJob/"; } diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Preferences.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Preferences.java index d224e3e4a41..cd4361410e7 100644 --- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Preferences.java +++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Preferences.java @@ -272,7 +272,7 @@ public boolean isSshKeyIsPresent(String host) { return sshKeysTable.getText().contains(host); } - // timeout is changed to 40 sec, is related to running tests on che6-ocp platform + // timeout is changed to 40 sec, is related to running tests on ocp platform public void waitSshKeyIsPresent(final String host) { new WebDriverWait(seleniumWebDriver, WIDGET_TIMEOUT_SEC) .until((ExpectedCondition) driver -> sshKeysTable.getText().contains(host)); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/gwt/CheckSimpleGwtAppTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/gwt/CheckSimpleGwtAppTest.java index 3ea2390211a..af7ebd4954b 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/gwt/CheckSimpleGwtAppTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/gwt/CheckSimpleGwtAppTest.java @@ -135,7 +135,7 @@ public void checkLaunchingCodeServer() throws Exception { .getUrl() .replace("tcp", "http"); - // the timeout needs for che6-ocp platform + // the timeout needs for ocp platform WaitUtils.sleepQuietly(10); seleniumWebDriver.get(url); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/intelligencecommand/CheckIntelligenceCommandFromToolbarTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/intelligencecommand/CheckIntelligenceCommandFromToolbarTest.java index 200f10459cb..29759678bca 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/intelligencecommand/CheckIntelligenceCommandFromToolbarTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/intelligencecommand/CheckIntelligenceCommandFromToolbarTest.java @@ -64,7 +64,7 @@ public void launchClonedWepAppTest() throws Exception { commandsToolbar.clickWithHoldAndLaunchCommandFromList(PROJECT_NAME + ": build and run"); consoles.waitExpectedTextIntoConsole(" Server startup in"); - // it needs when the test is running on the che6-ocp platform + // it needs when the test is running on the ocp platform String previewUrl = consoles.getPreviewUrl(); if (previewUrl.contains("route")) { WaitUtils.sleepQuietly(10); @@ -87,7 +87,7 @@ public void checkButtonsOnToolbar() { String currentWindow = seleniumWebDriver.getWindowHandle(); commandsToolbar.clickExecStopBtn(); - // it needs when the test is running on the che6-ocp platform + // it needs when the test is running on the ocp platform String previewUrl = consoles.getPreviewUrl(); String expectedText = previewUrl.contains("route") @@ -103,7 +103,7 @@ public void checkButtonsOnToolbar() { Assert.assertTrue(commandsToolbar.getTimerValue().matches("\\d\\d:\\d\\d")); Assert.assertTrue(commandsToolbar.getNumOfProcessCounter().equals("#2")); - // it needs when the test is running on the che6-ocp platform + // it needs when the test is running on the ocp platform if (previewUrl.contains("route")) { WaitUtils.sleepQuietly(10); }