Skip to content

Commit

Permalink
[Version] Increment to 3.0 (opensearch-project#1502)
Browse files Browse the repository at this point in the history
Increment from 2.0.0 to 3.0.0, also some version checks.
Also, add a release build verification workflow. To verify x64
and ARM64 artifacts are built successfully with dependencies.

Issue:
n/a

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
  • Loading branch information
kavilla authored and Peter Fitzgibbons committed Aug 10, 2022
1 parent 7060be9 commit b8c3279
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@ describe('plugins/opensearch', () => {
it('when majors and minors are not equal, but the engine is on legacy version 8.0.0 and OpenSearch Dashboards is on 2.0.0', () => {
expect(opensearchVersionCompatibleWithOpenSearchDashboards('8.0.0', '2.0.0')).toBe(false);
});

it('when majors and minors are not equal, but the engine is on legacy version 6.10.3 and OpenSearch Dashboards is on 3.0.0', () => {
expect(opensearchVersionCompatibleWithOpenSearchDashboards('6.10.3', '3.0.0')).toBe(false);
});

it('when majors and minors are not equal, but the engine is on legacy version 7.10.3 and OpenSearch Dashboards is on 3.0.0', () => {
expect(opensearchVersionCompatibleWithOpenSearchDashboards('7.10.3', '3.0.0')).toBe(false);
});

it('when majors and minors are not equal, but the engine is on legacy version 8.0.0 and OpenSearch Dashboards is on 3.0.0', () => {
expect(opensearchVersionCompatibleWithOpenSearchDashboards('8.0.0', '3.0.0')).toBe(false);
});
});

describe('returns true', () => {
Expand Down Expand Up @@ -110,6 +122,18 @@ describe('plugins/opensearch', () => {
it('when majors and minors are not equal, but the engine is on legacy version 7.10.2 and OpenSearch Dashboards is on 2.1.0', () => {
expect(opensearchVersionCompatibleWithOpenSearchDashboards('7.10.2', '2.1.0')).toBe(true);
});

it('when majors and minors are not equal, but the engine is on legacy version 7.10.2 and OpenSearch Dashboards is on 3.0.0', () => {
expect(opensearchVersionCompatibleWithOpenSearchDashboards('7.10.2', '3.0.0')).toBe(true);
});

it('when majors and minors are not equal, but the engine is on legacy version 7.10.2 and OpenSearch Dashboards is on 3.0.1', () => {
expect(opensearchVersionCompatibleWithOpenSearchDashboards('7.10.2', '3.0.1')).toBe(true);
});

it('when majors and minors are not equal, but the engine is on legacy version 7.10.2 and OpenSearch Dashboards is on 3.1.0', () => {
expect(opensearchVersionCompatibleWithOpenSearchDashboards('7.10.2', '3.1.0')).toBe(true);
});
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ interface VersionNumbers {
*
* WARNING: OpenSearchDashboards 7.x could cause conflicts.
*/
const osdLegacyCompatibleMajorVersions = [1, 2];
const osdLegacyCompatibleMajorVersions = [1, 2, 3];

/**
* Checks for the compatibilitiy between OpenSearch and OpenSearchDashboards versions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,6 @@ describe('savedObjects/health_check/isConfigVersionUpgradeable', function () {
isUpgradeableTest('1.0.1', '1.0.0', false);
isUpgradeableTest('7.10.2', '1.1.0', true);
isUpgradeableTest('7.10.2', '2.0.0', true);
isUpgradeableTest('7.10.2', '3.0.0', false);
isUpgradeableTest('7.10.2', '3.0.0', true);
isUpgradeableTest('7.10.2', '4.0.0', false);
});
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import semver from 'semver';
*
* WARNING: OpenSearchDashboards 7.x could cause conflicts.
*/
const osdValidMajorVersions = [1, 2];
const osdValidMajorVersions = [1, 2, 3];
const rcVersionRegex = /^(\d+\.\d+\.\d+)\-rc(\d+)$/i;

function extractRcNumber(version: string): [string, number] {
Expand Down

0 comments on commit b8c3279

Please sign in to comment.