Skip to content

Commit

Permalink
Update fmatch version and not set keys (#7)
Browse files Browse the repository at this point in the history
* adding origon logging

Signed-off-by: Paige Rubendall <prubenda@redhat.com>

* adidng updated fmatch

Signed-off-by: Paige Rubendall <prubenda@redhat.com>

* k list

Signed-off-by: Paige Rubendall <prubenda@redhat.com>

* fixing spaces

Signed-off-by: Paige Rubendall <prubenda@redhat.com>

---------

Signed-off-by: Paige Rubendall <prubenda@redhat.com>
  • Loading branch information
paigerube14 authored Jan 30, 2024
1 parent 7d90ee9 commit 6ed1919
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
24 changes: 8 additions & 16 deletions orion.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def orion(config, debug, output):
logger.error("An error occurred: %s", e)
sys.exit(1)
for test in data["tests"]:
metadata = get_metadata(test)
metadata = get_metadata(test, logger)
logger.info("The test %s has started", test["name"])
match = Matcher(index="perf_scale_ci", level=level)
uuids = match.get_uuid_by_metadata(metadata)
Expand Down Expand Up @@ -108,7 +108,7 @@ def orion(config, debug, output):
match.save_results(merged_df, csv_file_path=output)


def get_metadata(test):
def get_metadata(test,logger):
"""Gets metadata of the run from each test
Args:
Expand All @@ -117,21 +117,13 @@ def get_metadata(test):
Returns:
dict: dictionary of the metadata
"""
metadata_columns = [
"platform",
"masterNodesType",
"masterNodesCount",
"workerNodesType",
"workerNodesCount",
"benchmark",
"ocpVersion",
"networkType",
"encrypted",
"fips",
"ipsec",
]
metadata = {key: test[key] for key in metadata_columns if key in test}
metadata = {}
for k,v in test.items():
if k in ["metrics","name"]:
continue
metadata[k] = v
metadata["ocpVersion"] = str(metadata["ocpVersion"])
logger.debug('metadata' + str(metadata))
return metadata


Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ click==8.1.7
elastic-transport==8.11.0
elasticsearch==8.11.1
elasticsearch7==7.13.0
fmatch==0.0.2
fmatch==0.0.3
numpy==1.26.3
pandas==2.1.4
python-dateutil==2.8.2
Expand Down

0 comments on commit 6ed1919

Please sign in to comment.