Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update crc starting server workflow, update container runtimes #1994

Merged
merged 1 commit into from Apr 8, 2021
Merged

Update crc starting server workflow, update container runtimes #1994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ....ui.bot.test/src/org/jboss/tools/cdk/ui/bot/test/server/adapter/CDK32IntegrationTest.java
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@
@CleanOpenShiftExplorer
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
usernameProperty="developers.username",
Expand Down
2 changes: 1 addition & 1 deletion ...st/src/org/jboss/tools/cdk/ui/bot/test/server/adapter/CDK32ServerAdapterProfilesTest.java
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@
@CleanOpenShiftExplorer
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
usernameProperty="developers.username",
passwordProperty="developers.password",
useExistingBinaryFromConfig=true,
Expand Down
2 changes: 1 addition & 1 deletion ...test/src/org/jboss/tools/cdk/ui/bot/test/server/adapter/CDKServerAdapterSetupCDKTest.java
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@
@CleanDockerExplorer
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
usernameProperty="developers.username",
Expand Down
2 changes: 1 addition & 1 deletion ....bot.test/src/org/jboss/tools/cdk/ui/bot/test/server/adapter/CDKWrongCredentialsTest.java
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@
@CleanOpenShiftExplorer
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
usernameProperty="developers.username",
passwordProperty="developers.password",
useExistingBinaryFromConfig=true,
Expand Down
23 changes: 22 additions & 1 deletion ...dk.ui.bot.test/src/org/jboss/tools/cdk/ui/bot/test/server/adapter/CRCIntegrationTest.java
View file
Open in desktop
Expand Up @@ -98,7 +98,28 @@ public void testCRCServerAdapter() {
}
connection.select();
handleSSLDialog();
connection.refresh(TimePeriod.getCustom(120));
try {
handleSSLDialog();
} catch (CoreLayerException exc) {
// consumes exception, dialog was not shown
}
try {
connection.refresh(TimePeriod.getCustom(120));
} catch (WaitTimeoutExpiredException exc) {
ShellIsAvailable refreshShellAvailable = new ShellIsAvailable(CDKLabel.Shell.PROBLEM_DIALOG);
new WaitUntil(refreshShellAvailable, TimePeriod.DEFAULT, false);
if (refreshShellAvailable.getResult() != null) {
DefaultShell refreshFailed = new DefaultShell(refreshShellAvailable.getResult());
System.out.println("Refresh Failed dialog expected, text: " + refreshFailed.getText());
if (refreshFailed.getText().contains("Failed to refresh element")) {
refreshFailed.close();
new WaitWhile(refreshShellAvailable, TimePeriod.DEFAULT);
} else {
fail("Unexpected problem dialog appeared: " + refreshFailed.getText());
}
}
connection.refresh(TimePeriod.getCustom(60));
}
connection.expand();
CDKTestUtils.testOpenshiftConnection(connection);
// should be addad after crc ga
Expand Down
2 changes: 1 addition & 1 deletion ...rc/org/jboss/tools/cdk/ui/bot/test/server/adapter/MinishiftServerAdapterProfilesTest.java
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@
@CleanDockerExplorer
@CleanOpenShiftExplorer
@ContainerRuntimeServer(
version = CDKVersion.MINISHIFT1342,
version = CDKVersion.MINISHIFT1343,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
useExistingBinaryInProperty="minishift")
Expand Down
2 changes: 1 addition & 1 deletion ...t.test/src/org/jboss/tools/cdk/ui/bot/test/server/adapter/MinishiftServerAdapterTest.java
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@
@CleanDockerExplorer
@CleanOpenShiftExplorer
@ContainerRuntimeServer(
version = CDKVersion.MINISHIFT1342,
version = CDKVersion.MINISHIFT1343,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
useExistingBinaryInProperty="minishift")
Expand Down
2 changes: 1 addition & 1 deletion ...ols/cdk/ui/bot/test/server/adapter/openshift/CDKImageRegistryUrlDiscoveryFailureTest.java
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
@RunWith(RedDeerSuite.class)
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
usernameProperty="developers.username",
Expand Down
2 changes: 1 addition & 1 deletion ...boss/tools/cdk/ui/bot/test/server/adapter/openshift/CDKImageRegistryUrlDiscoveryTest.java
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@
@RunWith(RedDeerSuite.class)
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
usernameProperty="developers.username",
Expand Down
2 changes: 1 addition & 1 deletion ...boss/tools/cdk/ui/bot/test/server/adapter/openshift/CDKImageRegistryUrlValidatorTest.java
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@
@RunWith(RedDeerSuite.class)
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
usernameProperty="developers.username",
Expand Down
2 changes: 1 addition & 1 deletion ....ui.bot.test/src/org/jboss/tools/cdk/ui/bot/test/server/editor/CDK32ServerEditorTest.java
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@
*/
@RunWith(RedDeerSuite.class)
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
usernameProperty="developers.username",
Expand Down
2 changes: 1 addition & 1 deletion ...bot.test/src/org/jboss/tools/cdk/ui/bot/test/server/editor/MinishiftServerEditorTest.java
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@
*/
@RunWith(RedDeerSuite.class)
@ContainerRuntimeServer(
version = CDKVersion.MINISHIFT1342,
version = CDKVersion.MINISHIFT1343,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
createServerAdapter=false,
Expand Down
2 changes: 1 addition & 1 deletion .../src/org/jboss/tools/cdk/ui/bot/test/server/editor/launch/CDKLaunchConfigurationTest.java
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@
*/
@RunWith(RedDeerSuite.class)
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
useExistingBinaryFromConfig=true,
makeRuntimePersistent=true,
usernameProperty="developers.username",
Expand Down
2 changes: 1 addition & 1 deletion ...ot.test/src/org/jboss/tools/cdk/ui/bot/test/server/runtime/CDK32RuntimeDetectionTest.java
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
@DisableSecureStorage
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CDK3130,
version = CDKVersion.CDK3150,
usernameProperty="developers.username",
passwordProperty="developers.password",
createServerAdapter=false,
Expand Down
2 changes: 1 addition & 1 deletion ....bot.test/src/org/jboss/tools/cdk/ui/bot/test/server/runtime/CRCRuntimeDetectionTest.java
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
*/
@RemoveCDKServers
@ContainerRuntimeServer(
version = CDKVersion.CRC1120,
version = CDKVersion.CRC1240,
createServerAdapter=false,
useExistingBinaryInProperty="crc.binary",
adapterName = CDKAbstractTest.SERVER_ADAPTER_CRC)
Expand Down
2 changes: 1 addition & 1 deletion .../src/org/jboss/tools/cdk/ui/bot/test/server/wizard/download/CDK32DownloadRuntimeTest.java
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ public CDK32DownloadRuntimeTest(CDKVersion version) {

@Parameters(name = "{0}")
public static Collection<CDKVersion> data() {
return Arrays.asList(CDKVersion.CDK3120);
return Arrays.asList(CDKVersion.CDK3150);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...st/src/org/jboss/tools/cdk/ui/bot/test/server/wizard/download/CRCDownloadRuntimeTest.java
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ public CRCDownloadRuntimeTest(CDKVersion version) {

@Parameters(name = "{0}")
public static Collection<CDKVersion> data() {
return Arrays.asList(CDKVersion.CRC1120);
return Arrays.asList(CDKVersion.CRC1240);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...s/cdk/ui/bot/test/server/wizard/download/DownloadContainerRuntimeDefaultSettingsTest.java
View file
Open in desktop
Expand Up @@ -27,12 +27,12 @@ protected String getServerAdapter() {

@Test
public void testDownloadingCDK390RuntimeDefaults() {
downloadAndVerifyContainerRuntime(CDKVersion.CDK3130, USERNAME, PASSWORD, "", "", true, true);
downloadAndVerifyContainerRuntime(CDKVersion.CDK3150, USERNAME, PASSWORD, "", "", true, true);
}

@Test
public void testDownloadingMinishiftRuntimeDefaults() {
downloadAndVerifyContainerRuntime(CDKVersion.MINISHIFT1342, "", "", "", "", true, true);
downloadAndVerifyContainerRuntime(CDKVersion.MINISHIFT1343, "", "", "", "", true, true);
}

}
2 changes: 1 addition & 1 deletion .../org/jboss/tools/cdk/ui/bot/test/server/wizard/download/MinishiftDownloadRuntimeTest.java
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ public MinishiftDownloadRuntimeTest(CDKVersion version) {

@Parameters(name = "{0}")
public static Collection<CDKVersion> data() {
return Arrays.asList(CDKVersion.MINISHIFT1342);
return Arrays.asList(CDKVersion.MINISHIFT1343);
}

@Override
Expand Down
17 changes: 16 additions & 1 deletion ...rk/org.jboss.tools.cdk.reddeer/src/org/jboss/tools/cdk/reddeer/core/enums/CDKVersion.java
View file
Open in desktop
Expand Up @@ -35,6 +35,8 @@ public enum CDKVersion {
CDK3110 (CDKServerAdapterType.CDK32, "3.11.0", CDKLabel.Server.CDK32_SERVER_NAME, "cdk-3.11.0-1-minishift-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch() + CDKRuntimeOS.get().getSuffix()),
CDK3120 (CDKServerAdapterType.CDK32, "3.12.0", CDKLabel.Server.CDK32_SERVER_NAME, "cdk-3.12.0-1-minishift-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch() + CDKRuntimeOS.get().getSuffix()),
CDK3130 (CDKServerAdapterType.CDK32, "3.13.0", CDKLabel.Server.CDK32_SERVER_NAME, "cdk-3.13.0-1-minishift-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch() + CDKRuntimeOS.get().getSuffix()),
CDK3140 (CDKServerAdapterType.CDK32, "3.14.0", CDKLabel.Server.CDK32_SERVER_NAME, "cdk-3.14.0-1-minishift-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch() + CDKRuntimeOS.get().getSuffix()),
CDK3150 (CDKServerAdapterType.CDK32, "3.15.0", CDKLabel.Server.CDK32_SERVER_NAME, "cdk-3.15.0-1-minishift-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch() + CDKRuntimeOS.get().getSuffix()),
MINISHIFT1140 (CDKServerAdapterType.MINISHIFT17, "1.14.0", CDKLabel.Server.MINISHIFT_SERVER_NAME, "minishift-1.14.0-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch()),
MINISHIFT1151 (CDKServerAdapterType.MINISHIFT17, "1.15.1", CDKLabel.Server.MINISHIFT_SERVER_NAME, "minishift-1.15.1-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch()),
MINISHIFT1161 (CDKServerAdapterType.MINISHIFT17, "1.16.1", CDKLabel.Server.MINISHIFT_SERVER_NAME, "minishift-1.16.1-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch()),
Expand All @@ -57,6 +59,7 @@ public enum CDKVersion {
MINISHIFT1330 (CDKServerAdapterType.MINISHIFT17, "1.33.0", CDKLabel.Server.MINISHIFT_SERVER_NAME, "minishift-1.33.0-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch()),
MINISHIFT1341 (CDKServerAdapterType.MINISHIFT17, "1.34.1", CDKLabel.Server.MINISHIFT_SERVER_NAME, "minishift-1.34.1-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch()),
MINISHIFT1342 (CDKServerAdapterType.MINISHIFT17, "1.34.2", CDKLabel.Server.MINISHIFT_SERVER_NAME, "minishift-1.34.2-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch()),
MINISHIFT1343 (CDKServerAdapterType.MINISHIFT17, "1.34.3", CDKLabel.Server.MINISHIFT_SERVER_NAME, "minishift-1.34.3-" + CDKRuntimeOS.get().getRuntimeFullName() + getArch()),
CRC100 (CDKServerAdapterType.CRC, "1.0.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.0.0" + getArch()),
CRC110 (CDKServerAdapterType.CRC, "1.1.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.1.0" + getArch()),
CRC120 (CDKServerAdapterType.CRC, "1.2.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.2.0" + getArch()),
Expand All @@ -69,7 +72,19 @@ public enum CDKVersion {
CRC190 (CDKServerAdapterType.CRC, "1.9.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.9.0" + getArch()),
CRC1100 (CDKServerAdapterType.CRC, "1.10.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.10.0" + getArch()),
CRC1110 (CDKServerAdapterType.CRC, "1.11.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.11.0" + getArch()),
CRC1120 (CDKServerAdapterType.CRC, "1.12.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.12.0" + getArch());
CRC1120 (CDKServerAdapterType.CRC, "1.12.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.12.0" + getArch()),
CRC1130 (CDKServerAdapterType.CRC, "1.13.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.13.0" + getArch()),
CRC1140 (CDKServerAdapterType.CRC, "1.14.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.14.0" + getArch()),
CRC1150 (CDKServerAdapterType.CRC, "1.15.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.15.0" + getArch()),
CRC1160 (CDKServerAdapterType.CRC, "1.16.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.16.0" + getArch()),
CRC1170 (CDKServerAdapterType.CRC, "1.17.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.17.0" + getArch()),
CRC1180 (CDKServerAdapterType.CRC, "1.18.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.18.0" + getArch()),
CRC1190 (CDKServerAdapterType.CRC, "1.19.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.19.0" + getArch()),
CRC1200 (CDKServerAdapterType.CRC, "1.20.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.20.0" + getArch()),
CRC1210 (CDKServerAdapterType.CRC, "1.21.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.21.0" + getArch()),
CRC1220 (CDKServerAdapterType.CRC, "1.22.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.22.0" + getArch()),
CRC1230 (CDKServerAdapterType.CRC, "1.23.1", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.23.1" + getArch()),
CRC1240 (CDKServerAdapterType.CRC, "1.24.0", CDKLabel.Server.CRC_SERVER_NAME, "crc-" + CDKRuntimeOS.get().getRuntimeFullName() + "-1.24.0" + getArch());


private final CDKServerAdapterType type;
Expand Down
2 changes: 1 addition & 1 deletion ...framework/org.jboss.tools.cdk.reddeer/src/org/jboss/tools/cdk/reddeer/utils/CDKUtils.java
View file
Open in desktop
Expand Up @@ -345,8 +345,8 @@ public static void initializeDownloadRutimeDialog(NewCDK3ServerWizardPage wizard
public static void confirmOverwritingOfSetupCDK(String shellName) {
SystemJobIsRunning runningJob = new SystemJobIsRunning(new JobMatcher("Setup CDK"));
log.info("Confirming overwriting of minishift home content");
handleWarningDialog(shellName, OkButton.class);
new WaitUntil(runningJob, TimePeriod.MEDIUM);
handleWarningDialog(shellName, OkButton.class);
new WaitWhile(runningJob, TimePeriod.getCustom(30));
new WaitUntil(new ConsoleHasNoChange(TimePeriod.MEDIUM), TimePeriod.DEFAULT);
}
Expand Down