Merge pull request #3100 from The-OpenROAD-Project-staging/pr-3077-fix

ci: remove variant from metadata file paths

Author: vvbandeira

flow/util/genReportTable.py

@@ -51,7 +51,7 @@
 args = parser.parse_args()
 
 goldFilename = f"metadata-{args.variant}-ok.json"
-runFilename = f"metadata-{args.variant}.json"
+runFilename = f"metadata.json"
 
 
 def readMetrics(fname, justLoad=False):

flow/util/uploadMetadata.py

@@ -31,7 +31,7 @@
 args = parser.parse_args()
 
 
-def upload_data(db, datafile, platform, design, variant, args, rules):
+def upload_data(db, dataFile, platform, design, variant, args, rules):
     # Set the document data
     key = args.commitSHA + "-" + platform + "-" + design + "-" + variant
     doc_ref = db.collection("build_metrics").document(key)
@@ -166,9 +166,7 @@ def upload_data(db, datafile, platform, design, variant, args, rules):
         raise Exception(f"Failed to upload data for {platform} {design} {variant}.")
 
 
-def get_rules(platform, design, variant):
-    runFilename = f"rules-{variant}.json"
-    dataFile = os.path.join("designs", platform, design, runFilename)
+def get_rules(dataFile):
     data = {}
     if os.path.exists(dataFile):
         with open(dataFile) as f:
@@ -182,7 +180,7 @@ def get_rules(platform, design, variant):
 # Initialize Firestore client
 db = firestore.client()
 
-runFilename = f"metadata-{args.variant}.json"
+RUN_FILENAME = "metadata.json"
 
 for reportDir, dirs, files in sorted(os.walk("reports", topdown=False)):
     dirList = reportDir.split(os.sep)
@@ -193,14 +191,14 @@ def get_rules(platform, design, variant):
     platform = dirList[1]
     design = dirList[2]
     variant = dirList[3]
-    dataFile = os.path.join(reportDir, runFilename)
+    dataFile = os.path.join(reportDir, RUN_FILENAME)
     if not os.path.exists(dataFile):
         print(f"[WARN] No data file for {platform} {design} {variant}.")
         continue
     if platform == "sky130hd_fakestack" or platform == "src":
         print(f"[WARN] Skiping upload {platform} {design} {variant}.")
         continue
     print(f"[INFO] Get rules for {platform} {design} {variant}.")
-    rules = get_rules(platform, design, variant)
+    rules = get_rules(os.path.join("designs", platform, design, RUN_FILENAME))
     print(f"[INFO] Upload data for {platform} {design} {variant}.")
     upload_data(db, dataFile, platform, design, variant, args, rules)