Skip to content
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

set default pipeline to benchmark-only #387

Merged
merged 2 commits into from
Oct 17, 2023
+18 −6
Merged

set default pipeline to benchmark-only #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bb8ad4
set benchmark-only as default pipeline instead of from-sources
cgchinmay Oct 15, 2023
21340d9
fixed formatting error
cgchinmay Oct 16, 2023
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
3 changes: 2 additions & 1 deletion it/sources_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
def test_sources(cfg):
port = 19200
it.wait_until_port_is_free(port_number=port)
assert it.execute_test(cfg, f"--revision=latest --workload=geonames --test-mode --target-hosts=127.0.0.1:{port} "
assert it.execute_test(cfg, f"--pipeline=from-sources --revision=latest \
--workload=geonames --test-mode --target-hosts=127.0.0.1:{port} "
f"--test-procedure=append-no-conflicts --provision-config-instance=4gheap "
f"--opensearch-plugins=analysis-icu") == 0

Expand Down
12 changes: 7 additions & 5 deletions osbenchmark/test_execution_orchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,16 +344,18 @@ def list_pipelines():

def run(cfg):
logger = logging.getLogger(__name__)
name = cfg.opts("test_execution", "pipeline")
# pipeline is no more mandatory, will default to benchmark-only
name = cfg.opts("test_execution", "pipeline", mandatory=False)
test_execution_id = cfg.opts("system", "test_execution.id")
logger.info("Test Execution id [%s]", test_execution_id)
if len(name) == 0:
# assume from-distribution pipeline if distribution.version has been specified and --pipeline cli arg not set
if not name:
# assume from-distribution pipeline if distribution.version has been specified
if cfg.exists("builder", "distribution.version"):
name = "from-distribution"
else:
name = "from-sources"
logger.info("User specified no pipeline. Automatically derived pipeline [%s].", name)
name = "benchmark-only"
logger.info("User did not specify distribution.version or pipeline. Using default pipeline [%s].", name)

cfg.add(config.Scope.applicationOverride, "test_execution", "pipeline", name)
else:
logger.info("User specified pipeline [%s].", name)
Expand Down
9 changes: 9 additions & 0 deletions tests/test_execution_orchestrator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,12 @@ def test_runs_a_known_pipeline(unittest_pipeline):
test_execution_orchestrator.run(cfg)

unittest_pipeline.target.assert_called_once_with(cfg)

def test_runs_a_default_pipeline(benchmark_only_pipeline):
# with no pipeline specified, should default to benchmark-only
cfg = config.Config()
cfg.add(config.Scope.benchmark, "system", "test_execution.id", "28a032d1-0b03-4579-ad2a-c65316f126e9")

test_execution_orchestrator.run(cfg)

benchmark_only_pipeline.target.assert_called_once_with(cfg)
Loading