Skip to content

RI-6386 fix e2e oss cluster ssh config and tests #4224

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

Merged
merged 1 commit into from
Dec 25, 2024
Merged

RI-6386 fix e2e oss cluster ssh config and tests #4224

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/e2e/helpers/conf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ export const ossStandaloneForSSHConfig = {
};

export const ossClusterForSSHConfig = {
host: process.env.OSS_STANDALONE_SSH_HOST || '172.33.100.211',
port: process.env.OSS_STANDALONE_SSH_PORT || '6379',
databaseName: `${process.env.OSS_STANDALONE_SSH_DATABASE_NAME || 'oss-cluster-for-ssh'}-${uniqueId}`,
databaseUsername: process.env.OSS_STANDALONE_SSH_USERNAME,
databasePassword: process.env.OSS_STANDALONE_SSH_PASSWORD
host: process.env.OSS_CLUSTER_SSH_HOST || '172.31.100.211',
port: process.env.OSS_CLUSTER_SSH_PORT || '6379',
databaseName: `${process.env.OSS_CLUSTER_SSH_DATABASE_NAME || 'oss-cluster-for-ssh'}-${uniqueId}`,
databaseUsername: process.env.OSS_CLUSTER_SSH_USERNAME,
databasePassword: process.env.OSS_CLUSTER_SSH_PASSWORD
};

export const ossStandaloneTlsConfig = {
Expand Down
12 changes: 7 additions & 5 deletions tests/e2e/tests/electron/critical-path/database/add-ssh-db.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,17 @@ const sshDbClusterPass = {
};

fixture `Adding database with SSH`
.meta({ type: 'critical_path', rte: rte.standalone })
.meta({ type: 'critical_path'})
.page(commonUrl)
.beforeEach(async() => {
await databaseHelper.acceptLicenseTerms();
})
.after(async() => {
// Delete databases
await databaseAPIRequests.deleteStandaloneDatabasesByNamesApi([sshDbPass.databaseName, sshDbPrivateKey.databaseName, sshDbPasscode.databaseName, newClonedDatabaseAlias]);
await databaseAPIRequests.deleteStandaloneDatabasesByNamesApi([sshDbPass.databaseName, sshDbPrivateKey.databaseName, sshDbPasscode.databaseName, newClonedDatabaseAlias, sshDbClusterPass.databaseName]);
});
test('Adding database with SSH', async t => {
test
.meta({ rte: rte.standalone })('Adding database with SSH', async t => {
const tooltipText = [
'Enter a value for required fields (3):',
'SSH Host',
Expand Down Expand Up @@ -122,14 +123,15 @@ test('Adding database with SSH', async t => {
await myRedisDatabasePage.clickOnDBByName(sshDbPasscode.databaseName);
await Common.checkURLContainsText('browser');
});
test('Verify that OSS Cluster database with SSH can be added and work correctly', async t => {
test
.meta({ rte: rte.ossCluster })('Verify that OSS Cluster database with SSH can be added and work correctly', async t => {
const sshWithPass = {
...sshParams,
sshPassword: 'pass'
};
// Verify that user can add SSH tunnel with Password for OSS Cluster database
await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
await myRedisDatabasePage.clickOnDBByName(sshDbClusterPass.databaseName);

//verify that db is added and profiler works
await t.click(browserPage.Profiler.expandMonitor);
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ test
};
// Verify that user can add SSH tunnel with Password for OSS Cluster database
await myRedisDatabasePage.AddRedisDatabaseDialog.addStandaloneSSHDatabase(sshDbClusterPass, sshWithPass);
await myRedisDatabasePage.clickOnDBByName(sshDbPass.databaseName);
await myRedisDatabasePage.clickOnDBByName(sshDbClusterPass.databaseName);
await Common.checkURLContainsText('browser');
});
test
Expand Down
Loading