Hide logs if all of JENKINS_USER, JENKINS_PASSWORD var is not set
Related_Prod: PRODX-54314
Change-Id: I88f463917c38026e733262ecca5edacdd75ad6c5
diff --git a/rp_reporter/rp_reporter/batch_reporter.py b/rp_reporter/rp_reporter/batch_reporter.py
index ab093fe..fa57867 100755
--- a/rp_reporter/rp_reporter/batch_reporter.py
+++ b/rp_reporter/rp_reporter/batch_reporter.py
@@ -20,6 +20,8 @@
from rp_reporter.settings import TIME_FORMAT
from rp_reporter.report_from_xml import timestamp, Reporter
+from rp_reporter.settings import JENKINS_USER, JENKINS_PASSWORD
+
LOG = logging.getLogger("rp_reporter")
@@ -452,14 +454,15 @@
+ f"\nPod Logs {artifactory_url}/pod-logs.tar.gz",
)
print(f"report is here {report_url}")
- print("Pushing new description to job...")
- try:
- job.description = (
- job.description + f"<br><br> "
- f"<a href='{report_url}'>Link to ReportPortal</a> <br>"
- )
- except Exception as e:
- print(f"Can't push description to {job=}: {e}")
+ if JENKINS_USER or JENKINS_PASSWORD:
+ print("Pushing new description to job...")
+ try:
+ job.description = (
+ job.description + f"<br><br> "
+ f"<a href='{report_url}'>Link to ReportPortal</a> <br>"
+ )
+ except Exception as e:
+ print(f"Can't push description to {job=}: {e}")
print(f" ʕノ•ᴥ•ʔノ Completed")
diff --git a/rp_reporter/rp_reporter/settings.py b/rp_reporter/rp_reporter/settings.py
index 74420bc..9a3ef56 100644
--- a/rp_reporter/rp_reporter/settings.py
+++ b/rp_reporter/rp_reporter/settings.py
@@ -50,6 +50,13 @@
environ.get("RP_PROJECT") or from_conf("RP_PROJECT") or call_error("RP_PROJECT")
)
+JENKINS_USER = (
+ environ.get('JENKINS_USER') or from_conf("JENKINS_USER")
+)
+JENKINS_PASSWORD = (
+ environ.get('JENKINS_PASSWORD') or from_conf("JENKINS_PASSWORD")
+)
+
TIME_FORMAT = "%Y-%m-%d"
if __name__ == "__main__":