Skip to content

PMM-7: Fix Upgrade #1096

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
peterSirotnak merged 4 commits into from
Jun 11, 2026
Merged

PMM-7: Fix Upgrade #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a4fb6f
PMM-7: Fix Upgrade
peterSirotnak Jun 11, 2026
fb5cfe8
PMM-7: Fix Upgrade
peterSirotnak Jun 11, 2026
095d546
PMM-7: Fix Upgrade
peterSirotnak Jun 11, 2026
43d834c
PMM-7: Fix Upgrade
peterSirotnak Jun 11, 2026
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
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
uses: percona/pmm-qa/.github/workflows/e2e-tests-matrix.yml@main
with:
sha: 'null'
pmm_ui_tests_branch: ${{ github.head_ref }}

@yurkovychv yurkovychv Jun 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this line is removed?

@peterSirotnak peterSirotnak Jun 16, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e2e-tests-matrix.yml does not contain pmm ui test branch anymore, we do not use this repo.

pmm_qa_branch: 'main'
pmm_server_image: 'perconalab/pmm-server:3-dev-latest'
pmm_client_image: 'perconalab/pmm-client:3-dev-latest'
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/remoteInstancesFixture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class RemoteInstancesFixture {
ps_8_4: {
name: 'ps_8_4',
type: 'MySQL',
host: 'ps_pmm_8.4_1',
host: 'ps_pmm_8_4_1',
port: '3306',
server_port: '3306',
username: 'root',
Expand Down
2 changes: 1 addition & 1 deletion tests/remoteInstances/remoteInstancesHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ module.exports = {
clusterName: 'mysql_clstr',
},
ps_8_4: {
host: 'ps_pmm_8.4_1',
host: 'ps_pmm_8_4_1',
port: '3306',
server_port: '3306',
username: 'root',
Expand Down
8 changes: 5 additions & 3 deletions tests/upgrade/customPassword_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,22 @@ Data(clientDbServices).Scenario(
address = '127.0.0.1';
}

const getContainerName = async (partialContainerName) => await I.verifyCommand(`docker ps --format "{{.Names}}" | grep ${partialContainerName}`);

switch (serviceType) {
case SERVICE_TYPE.MYSQL:
output = await I.verifyCommand(
`pmm-admin add mysql --node-id=${node_id} --pmm-agent-id=${pmm_agent_id} --port=${port} --password=${credentials.perconaServer.root.password} --host=${address} --query-source=perfschema --agent-password=uitests --custom-labels="testing=upgrade" upgrade-${upgrade_service}`,
`docker exec ${await getContainerName('ps_pmm')} pmm-admin add mysql --node-id=${node_id} --pmm-agent-id=${pmm_agent_id} --port=${port} --password=${credentials.perconaServer.root.password} --host=${address} --query-source=perfschema --agent-password=uitests --custom-labels="testing=upgrade" upgrade-${upgrade_service}`,
);
break;
case SERVICE_TYPE.POSTGRESQL:
output = await I.verifyCommand(
`pmm-admin add postgresql --username=${credentials.pdpgsql.username} --password=${credentials.pdpgsql.password} --node-id=${node_id} --pmm-agent-id=${pmm_agent_id} --port=${port} --host=${address} --agent-password=uitests --custom-labels="testing=upgrade" upgrade-${upgrade_service}`,
`docker exec ${await getContainerName('pgsql_pgss_pmm')} pmm-admin add postgresql --username=${credentials.pdpgsql.username} --password=${credentials.pdpgsql.password} --node-id=${node_id} --pmm-agent-id=${pmm_agent_id} --port=${port} --host=${address} --agent-password=uitests --custom-labels="testing=upgrade" upgrade-${upgrade_service}`,
);
break;
case SERVICE_TYPE.MONGODB:
output = await I.verifyCommand(
`pmm-admin add mongodb --username=${credentials.mongoReplicaPrimaryForBackups.username} --password="${credentials.mongoReplicaPrimaryForBackups.password}" --port=${credentials.mongoReplicaPrimaryForBackups.port} --host=127.0.0.1 --agent-password=uitests --custom-labels="testing=upgrade" upgrade-${upgrade_service}`,
`docker exec ${await getContainerName('rs101')} pmm-admin add mongodb --username=${credentials.mongoReplicaPrimaryForBackups.username} --password="${credentials.mongoReplicaPrimaryForBackups.password}" --port=27017 --host=127.0.0.1 --agent-password=uitests --custom-labels="testing=upgrade" upgrade-${upgrade_service}`,
);
break;
default:
Expand Down
5 changes: 3 additions & 2 deletions tests/upgrade/dashboards_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,15 @@ Scenario(

const resp1 = await grafanaAPI.createCustomDashboard('test-dashboard', insightFolder.id);
const resp2 = await grafanaAPI.createCustomDashboard('test-dashboard', experimentalFolder.id);
const workFolder = await I.verifyCommand('pwd');

await I.writeFileSync('./dashboard.json', JSON.stringify({
await I.writeFileSync(`${workFolder}/dashboard.json`, JSON.stringify({
DASHBOARD1_UID: resp1.uid,
DASHBOARD2_UID: resp2.uid,
}), false);

// Check if file with Dashboard info is present.
I.assertNotEqual(I.fileSize('./dashboard.json', false), 0, 'Was expecting Dashboard info in the File, but its empty');
I.assertNotEqual(I.fileSize(`${workFolder}/dashboard.json`, false), 0, 'Was expecting Dashboard info in the File, but its empty');
},
);

Expand Down
14 changes: 7 additions & 7 deletions tests/upgrade/ssl_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ Data(sslinstances).Scenario(
password: credentials.pdpgsql_ssl.password,
cluster: 'pgsql_remote_cluster',
environment: 'pgsql_remote_cluster',
tlsCAFile: await remoteInstancesPage.getFileContent(`/srv/qa-integration/pmm_qa/tls-ssl-setup/postgres/${version}/ca.crt`),
tlsKeyFile: await remoteInstancesPage.getFileContent(`/srv/qa-integration/pmm_qa/tls-ssl-setup/postgres/${version}/client.pem`),
tlsCertFile: await remoteInstancesPage.getFileContent(`/srv/qa-integration/pmm_qa/tls-ssl-setup/postgres/${version}/client.crt`),
tlsCAFile: await remoteInstancesPage.getFileContent(`/srv/pmm-qa/qa-integration/pmm_qa/tls-ssl-setup/postgres/${version}/ca.crt`),
tlsKeyFile: await remoteInstancesPage.getFileContent(`/srv/pmm-qa/qa-integration/pmm_qa/tls-ssl-setup/postgres/${version}/client.pem`),
tlsCertFile: await remoteInstancesPage.getFileContent(`/srv/pmm-qa/qa-integration/pmm_qa/tls-ssl-setup/postgres/${version}/client.crt`),
};
await addInstanceAPI.addPostgreSqlSSL(details);
I.wait(5);
Expand All @@ -62,9 +62,9 @@ Data(sslinstances).Scenario(
password: 'pmm',
cluster: 'mysql_ssl_remote_cluster',
environment: 'mysql_ssl_remote_cluster',
tlsCAFile: await remoteInstancesPage.getFileContent(`/srv/qa-integration/pmm_qa/tls-ssl-setup/mysql/${version}/ca.pem`),
tlsKeyFile: await remoteInstancesPage.getFileContent(`/srv/qa-integration/pmm_qa/tls-ssl-setup/mysql/${version}/client-key.pem`),
tlsCertFile: await remoteInstancesPage.getFileContent(`/srv/qa-integration/pmm_qa/tls-ssl-setup/mysql/${version}/client-cert.pem`),
tlsCAFile: await remoteInstancesPage.getFileContent(`/srv/pmm-qa/qa-integration/pmm_qa/tls-ssl-setup/mysql/${version}/ca.pem`),
tlsKeyFile: await remoteInstancesPage.getFileContent(`/srv/pmm-qa/qa-integration/pmm_qa/tls-ssl-setup/mysql/${version}/client-key.pem`),
tlsCertFile: await remoteInstancesPage.getFileContent(`/srv/pmm-qa/qa-integration/pmm_qa/tls-ssl-setup/mysql/${version}/client-cert.pem`),
};
await addInstanceAPI.addMysqlSSL(details);
I.wait(5);
Expand All @@ -87,7 +87,7 @@ Data(sslinstances).Scenario(
environment: 'mongodb_ssl_remote_cluster',
tls_certificate_file_password: '',
tls_certificate_key: await I.verifyCommand(`docker exec ${container} cat /mongodb_certs/client.pem`),
tls_ca: await remoteInstancesPage.getFileContent('/srv/qa-integration/pmm_psmdb_diffauth_setup/pki/ca.crt'),
tls_ca: await remoteInstancesPage.getFileContent('/srv/pmm-qa/qa-integration/pmm_psmdb_diffauth_setup/pki/ca.crt'),
};
await addInstanceAPI.addMongoDBSSL(details);
I.wait(5);
Expand Down
Loading