Skip to content
Snippets Groups Projects

Bugs coming from running on production fixed.

Merged Georgios Argyriou requested to merge bugs_fix into master
2 files
+ 27
30
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -36,7 +36,7 @@ def main():
@@ -36,7 +36,7 @@ def main():
body = "ERROR: Offline_token variable needs to be passed, exiting."
body = "ERROR: Offline_token variable needs to be passed, exiting."
send_email(ADMIN_EMAIL, subject, body)
send_email(ADMIN_EMAIL, subject, body)
print(body)
print(body)
sys.exit(1)
sys.exit(0)
## Authorization (generate an access token from the 'offline_token')
## Authorization (generate an access token from the 'offline_token')
url = 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'
url = 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'
@@ -47,7 +47,7 @@ def main():
@@ -47,7 +47,7 @@ def main():
body = "ERROR: Unable to auth, exiting"
body = "ERROR: Unable to auth, exiting"
send_email(ADMIN_EMAIL, subject, body)
send_email(ADMIN_EMAIL, subject, body)
print(body)
print(body)
sys.exit(1)
sys.exit(0)
token = json.loads(result.content)['access_token']
token = json.loads(result.content)['access_token']
## Getting list of available ISOs according to cset
## Getting list of available ISOs according to cset
@@ -64,7 +64,7 @@ def main():
@@ -64,7 +64,7 @@ def main():
print(body)
print(body)
if len(success_isos) != 0:
if len(success_isos) != 0:
success_email(success_isos)
success_email(success_isos)
sys.exit(1)
sys.exit(0)
content = json.loads(result.content)
content = json.loads(result.content)
items_of_interest = []
items_of_interest = []
@@ -90,10 +90,10 @@ def main():
@@ -90,10 +90,10 @@ def main():
iso_status = download_iso(token, item, arch_rel_dir)
iso_status = download_iso(token, item, arch_rel_dir)
if not iso_status[0]:
if not iso_status[0]:
if len(success_isos) == 0:
if len(success_isos) == 0:
sys.exit(1)
sys.exit(0)
else:
else:
success_email(success_isos)
success_email(success_isos)
sys.exit(1)
sys.exit(0)
else:
else:
if extract_iso(iso_status[1], arch_rel_dir):
if extract_iso(iso_status[1], arch_rel_dir):
if arch == "x86_64" or arch == "aarch64":
if arch == "x86_64" or arch == "aarch64":
@@ -103,20 +103,20 @@ def main():
@@ -103,20 +103,20 @@ def main():
success_isos.append(item)
success_isos.append(item)
else:
else:
if len(success_isos) == 0:
if len(success_isos) == 0:
sys.exit(1)
sys.exit(0)
else:
else:
success_email(success_isos)
success_email(success_isos)
sys.exit(1)
sys.exit(0)
else:
else:
arch_rel_dir = os.path.join(minor_rel_dir, arch)
arch_rel_dir = os.path.join(minor_rel_dir, arch)
iso_status = download_iso(token, item, arch_rel_dir)
iso_status = download_iso(token, item, arch_rel_dir)
if not iso_status[0]:
if not iso_status[0]:
if len(success_isos) == 0:
if len(success_isos) == 0:
sys.exit(1)
sys.exit(0)
else:
else:
success_email(success_isos)
success_email(success_isos)
sys.exit(1)
sys.exit(0)
else:
else:
if extract_iso(iso_status[1], arch_rel_dir):
if extract_iso(iso_status[1], arch_rel_dir):
if arch == "x86_64" or arch == "aarch64":
if arch == "x86_64" or arch == "aarch64":
@@ -126,19 +126,19 @@ def main():
@@ -126,19 +126,19 @@ def main():
success_isos.append(item)
success_isos.append(item)
else:
else:
if len(success_isos) == 0:
if len(success_isos) == 0:
sys.exit(1)
sys.exit(0)
else:
else:
success_email(success_isos)
success_email(success_isos)
sys.exit(1)
sys.exit(0)
else:
else:
arch_rel_dir = os.path.join(major_rel_dir, item_release, arch)
arch_rel_dir = os.path.join(major_rel_dir, item_release, arch)
iso_status = download_iso(token, item, arch_rel_dir)
iso_status = download_iso(token, item, arch_rel_dir)
if not iso_status[0]:
if not iso_status[0]:
if len(success_isos) == 0:
if len(success_isos) == 0:
sys.exit(1)
sys.exit(0)
else:
else:
success_email(success_isos)
success_email(success_isos)
sys.exit(1)
sys.exit(0)
else:
else:
if extract_iso(iso_status[1], arch_rel_dir):
if extract_iso(iso_status[1], arch_rel_dir):
if arch == "x86_64" or arch == "aarch64":
if arch == "x86_64" or arch == "aarch64":
@@ -148,10 +148,10 @@ def main():
@@ -148,10 +148,10 @@ def main():
success_isos.append(item)
success_isos.append(item)
else:
else:
if len(success_isos) == 0:
if len(success_isos) == 0:
sys.exit(1)
sys.exit(0)
else:
else:
success_email(success_isos)
success_email(success_isos)
sys.exit(1)
sys.exit(0)
if len(success_isos) == 0:
if len(success_isos) == 0:
dt = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
dt = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -305,6 +305,7 @@ def extract_iso(iso_fp, extract_dir):
@@ -305,6 +305,7 @@ def extract_iso(iso_fp, extract_dir):
break
break
if re.findall("\d+\.\d+", filename)[0].split(".")[0] != "8" or "dvd" not in filename:
if re.findall("\d+\.\d+", filename)[0].split(".")[0] != "8" or "dvd" not in filename:
 
print("Not 8 or dvd not in filename.")
verify = True
verify = True
if verify:
if verify:
@@ -418,16 +419,22 @@ def rhel_iso_to_aims(iso_dict):
@@ -418,16 +419,22 @@ def rhel_iso_to_aims(iso_dict):
pxe_path = os.path.join("/rhel", major, item_release, arch, "images/pxeboot")
pxe_path = os.path.join("/rhel", major, item_release, arch, "images/pxeboot")
result = subprocess.run(["/root/rheliso_to_aims.sh", name, arch, description, pxe_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
nomad_task = os.getenv('NOMAD_TASK_NAME')
 
project_status = nomad_task.split("_")[0]
 
if project_status == "prod":
 
aims_dest = ""
 
else:
 
aims_dest = "--testserver"
 
 
result = subprocess.run(["/root/rheliso_to_aims.sh", name, arch, description, pxe_path, aims_dest], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
if result.returncode == 0:
if result.returncode == 0:
print("%s added in AIMS as %s" % (iso_dict['filename'], name))
print("%s added in AIMS as %s" % (iso_dict['filename'], name))
print(result.stdout)
else:
else:
subject = "Shell script to AIMS error"
subject = "Shell script to AIMS error"
body = "ERROR: rheliso_to_aims.sh did NOT run succesfully due to:\n%s" % result.stderr
body = "ERROR: rheliso_to_aims.sh did NOT run succesfully due to:\n%s" % result.stderr
send_email(ADMIN_EMAIL, subject, body)
send_email(ADMIN_EMAIL, subject, body)
print(body)
print(body)
sys.exit(1)
sys.exit(0)
Loading