Skip to content

Commit

Permalink
Address PR comments
Browse files Browse the repository at this point in the history
Signed-off-by: Bishoy Boktor <[email protected]>
  • Loading branch information
Bishoy Boktor committed Apr 2, 2021
1 parent fdf404f commit ae5d795
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
2 changes: 0 additions & 2 deletions packages/osd-opensearch/src/artifact.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ const path = require('path');

const asyncPipeline = promisify(pipeline);
const DAILY_SNAPSHOTS_BASE_URL = '';
//'https://storage.googleapis.com/opensearch-dashboards-ci-opensearch-snapshots-daily';
const PERMANENT_SNAPSHOTS_BASE_URL = '';
//'https://storage.googleapis.com/opensearch-dashboards-ci-opensearch-snapshots-permanent';

const { cache } = require('./utils');
const { resolveCustomSnapshotUrl } = require('./custom_snapshots');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export async function runOpenSearch({ config, options }) {
: config.get('servers.opensearch.password'),
license,
log,
basePath: resolve(OPENSEARCH_DASHBOARDS_ROOT, '../OpenSearch'),
basePath: resolve(OPENSEARCH_DASHBOARDS_ROOT, '.opensearch'),
opensearchFrom: opensearchFrom || config.get('opensearchTestCluster.from'),
dataArchive: config.get('opensearchTestCluster.dataArchive'),
opensearchArgs,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export function createLegacyOpenSearchTestCluster(options = {}) {
const config = {
version: opensearchTestConfig.getVersion(),
installPath: resolve(basePath, clusterName),
sourcePath: resolve(OPENSEARCH_DASHBOARDS_ROOT, '../OpenSearch'),
sourcePath: resolve(OPENSEARCH_DASHBOARDS_ROOT, '.opensearch'),
password,
license,
basePath,
Expand All @@ -78,7 +78,6 @@ export function createLegacyOpenSearchTestCluster(options = {}) {
async start() {
let installPath;

console.log('I"M RUNNING WOOO');
if (opensearchFrom === 'source') {
installPath = (await cluster.installSource(config)).installPath;
} else if (opensearchFrom === 'snapshot') {
Expand Down
4 changes: 2 additions & 2 deletions scripts/opensearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ osdOpenSearch
license: 'oss',
password: 'changeme',
version: pkg.version,
'source-path': resolve(__dirname, '../../OpenSearch'),
'base-path': resolve(__dirname, '../../OpenSearch'),
'source-path': resolve(__dirname, '../../opensearch'),
'base-path': resolve(__dirname, '../.opensearch'),
ssl: false,
})
.catch(function (e) {
Expand Down

0 comments on commit ae5d795

Please sign in to comment.