Skip to content

Commit 04f51ee

Browse files
committed
Update for build_path error for monitor envs
1 parent 8451d62 commit 04f51ee

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/main/resources/scripts/parallel_full_reports.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def runSingleAtgCommand(self, cmd):
2525
result = subprocess.run(atgCmd, shell=True, capture_output=True, text=True)
2626
return result.stdout.strip()
2727
except Exception as e:
28-
return f'Error: {e}'
28+
return "Error: " + e
2929

3030

3131
class RunFullReportsParallel(object):
@@ -50,11 +50,11 @@ def __init__(self):
5050
max_licenses = self.getLicenseCount()
5151
max_envs = self.getEnvCount()
5252

53-
print([max_cpus, max_licenses, max_envs])
53+
#print([max_cpus, max_licenses, max_envs])
5454

5555
self.max_concurrent = min([max_cpus,max_licenses, max_envs])
5656

57-
print("Using licensing max = ", self.max_concurrent)
57+
#print("Using licensing max = ", self.max_concurrent)
5858
else:
5959
self.max_concurrent = int(args.jobs)
6060

@@ -82,7 +82,6 @@ def getLicenseCount(self):
8282
cmd = r'%VECTORCAST_DIR%\flexlm\lmutil lmstat -a -c %VECTOR_LICENSE_FILE% | findstr VECTORCAST_MANAGE:'
8383

8484
result = subprocess.run(cmd, shell=True, capture_output=True, text=True)
85-
8685
largest_available = 0
8786

8887
for line in result.stdout.split("\n"):
@@ -93,7 +92,7 @@ def getLicenseCount(self):
9392
if available > largest_available:
9493
largest_available = available
9594

96-
print("Largest Available: ", largest_available)
95+
#print("Largest Available: ", largest_available)
9796

9897
return largest_available
9998

@@ -111,7 +110,7 @@ def getLicenseCount(self):
111110
# Find DeviceSerialNumber
112111
FreeLicenses = root.find(".//FreeLicenses").text
113112

114-
print("FreeLicenses:", FreeLicenses)
113+
#print("FreeLicenses:", FreeLicenses)
115114

116115
return FreeLicenses
117116

@@ -123,7 +122,10 @@ def generate_report(self, key):
123122

124123
report_name = ""
125124

126-
build_dir = self.api.project.workspace + '/' + env.relative_working_directory
125+
if env.definition.is_monitored:
126+
build_dir = os.path.abspath(env.definition.original_environment_directory)
127+
else:
128+
build_dir = self.api.project.workspace + '/' + env.relative_working_directory
127129

128130
if len(key.split("/")) != 3:
129131
comp, ts, group, env_name = key.split("/")
@@ -148,9 +150,9 @@ def generate_report(self, key):
148150

149151
return result.stdout.strip()
150152
except Exception as e:
151-
return f'Error: {e}'
153+
return "Error: " + e
152154

153-
return f"Success: {report_name}: {result}"
155+
return "Success: " + report_name + ": " + result
154156

155157

156158
def run(self):
@@ -163,7 +165,6 @@ def run(self):
163165
for future in concurrent.futures.as_completed(futures):
164166
try:
165167
result = future.result() # This raises the exception if one occurred
166-
print(result)
167168
except Exception as e:
168169
report_name = futures[future]
169170
print("Exception in " + report_name + ": " + e)

0 commit comments

Comments
 (0)