From 38d301f165eee5d20713ddf6cd1389ff42eebfbf Mon Sep 17 00:00:00 2001 From: Saikumar Date: Wed, 4 Dec 2024 15:02:03 +0530 Subject: [PATCH 1/2] updates fix compatibility check --- cli/tests/generic.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/tests/generic.spec.ts b/cli/tests/generic.spec.ts index a774d7501..b543d8c1d 100644 --- a/cli/tests/generic.spec.ts +++ b/cli/tests/generic.spec.ts @@ -9,6 +9,8 @@ test.describe('PMM Client "Generic" CLI tests', async () => { // See: https://github.com/Percona-QA/package-testing/blob/master/playbooks/pmm2-client_integration_upgrade_custom_path.yml#L41 PMM_VERSION = cli.execute('curl -s https://raw.githubusercontent.com/Percona-Lab/pmm-submodules/PMM-2.0/VERSION | xargs') .stdout.trim(); + } else { + PMM_VERSION = `${process.env.CLIENT_VERSION}`; } test('PMM-T1258 Verify pmm-admin status shows node name', async ({}) => { From ac8c32be83cd320d12aa2a19285a8ca04d876b47 Mon Sep 17 00:00:00 2001 From: Saikumar Date: Wed, 4 Dec 2024 18:34:08 +0530 Subject: [PATCH 2/2] updates --- cli/tests/generic.spec.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cli/tests/generic.spec.ts b/cli/tests/generic.spec.ts index b543d8c1d..24d6d5e62 100644 --- a/cli/tests/generic.spec.ts +++ b/cli/tests/generic.spec.ts @@ -3,14 +3,12 @@ import * as cli from '@helpers/cli-helper'; import { readZipFile } from '@helpers/zip-helper'; test.describe('PMM Client "Generic" CLI tests', async () => { - let PMM_VERSION: string; + let PMM_VERSION = process.env.CLIENT_VERSION; if (/dev-latest|https:|pmm2-rc/.test(`${process.env.CLIENT_VERSION}`)) { // TODO: refactor to use docker hub API to remove file-update dependency // See: https://github.com/Percona-QA/package-testing/blob/master/playbooks/pmm2-client_integration_upgrade_custom_path.yml#L41 PMM_VERSION = cli.execute('curl -s https://raw.githubusercontent.com/Percona-Lab/pmm-submodules/PMM-2.0/VERSION | xargs') .stdout.trim(); - } else { - PMM_VERSION = `${process.env.CLIENT_VERSION}`; } test('PMM-T1258 Verify pmm-admin status shows node name', async ({}) => {