Skip to content

Commit b5d20b3

Browse files
Merge pull request #167 from magento-commerce/MCLOUD-13184
Warning with OpenSearch Version
2 parents bc12e35 + 728e005 commit b5d20b3

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/Service/Validator.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ class Validator
8585
'>=2.4.4' => '~7.10.0', // Greater than 7.10 isn't supported on cloud infrastructure.
8686
],
8787
ServiceInterface::NAME_OPENSEARCH => [
88-
'>=2.3.7-p3 <2.4.0 || >=2.4.3-p2 <2.4.6' => '~1.1.0 || 1.2.*',
89-
'>=2.4.6' => '^2',
88+
'>=2.3.7-p3 <2.4.0 || >=2.4.3-p2 <2.4.4-p7 || >=2.4.5 <2.4.5-p7' => '~1.1.0 || 1.2.*',
89+
'>=2.4.4-p8 < 2.4.5 || >=2.4.5-p6 <2.4.6' => '1.3.*',
90+
'>=2.4.6' => '^2'
9091
],
9192
ServiceInterface::NAME_RABBITMQ => [
9293
'<2.3.0' => '~3.5.0',

src/Test/Functional/Acceptance/AcceptanceCest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testDefault(\CliTester $I, \Codeception\Example $data): void
9090
$I->see('Home page');
9191
$I->see('CMS homepage content goes here.');
9292

93-
$log = $I->grabFileContent('/var/log/cloud.log');
93+
$log = $I->grabFileContent('/init/var/log/cloud.log');
9494
$I->assertStringContainsString('--admin-password=\'******\'', $log);
9595
if (strpos($log, '--db-password') !== false) {
9696
$I->assertStringContainsString('--db-password=\'******\'', $log);

src/Test/Functional/Acceptance/AdminCredentialCest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testInstallWithoutAdminEmail(\CliTester $I, \Codeception\Example
4949
$I->see('Home page');
5050
$I->see('CMS homepage content goes here.');
5151

52-
$log = $I->grabFileContent('/var/log/cloud.log');
52+
$log = $I->grabFileContent('/init/var/log/cloud.log');
5353
$I->assertStringContainsString($data['installMessage'], $log);
5454
$I->assertStringNotContainsString('--admin-user', $log);
5555
$I->assertStringNotContainsString('--admin-firstname', $log);

src/Test/Functional/Acceptance/DataTypesOptionValidationCest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function dataTypesValidationOnDeploy(\CliTester $I, \Codeception\Example
3636
$I->startEnvironment();
3737
$I->runDockerComposeCommand('run deploy cloud-deploy');
3838

39-
$log = $I->grabFileContent('/var/log/cloud.log');
39+
$log = $I->grabFileContent('/init/var/log/cloud.log');
4040
$I->assertStringContainsString($data['expectedError'], $log);
4141
}
4242

0 commit comments

Comments
 (0)