Merge pull request #75 from alokgoswami-ag/updated-cluster-status

Updated cluster status for 4.17 upi

Author: Power Cloud Robot

monitor.py

@@ -113,6 +113,7 @@ def get_jobs(prow_link):
                     return jobs_run_today                    
         else:
             return "Failed to get the prowCI response"
+        
     except requests.Timeout as e:
         return "Request timed out"
     except requests.RequestException as e:
@@ -240,13 +241,18 @@ def cluster_deploy_status(spy_link):
         except json.JSONDecodeError as e:
             return 'ERROR'
     else:
+        pattern=r"(\d+\.\d+)"
+        match=re.search(pattern,spy_link[8:])
+        version=float(match.group(0))
+        if "upgrade" in spy_link:
+            version=version-0.01 
         job_log_url = PROW_VIEW_URL + spy_link[8:] + '/artifacts/' + job_type + '/ipi-install-' + job_platform +'-install/finished.json'
         if "sno" in spy_link:
             job_log_url = PROW_VIEW_URL + spy_link[8:] + '/artifacts/' + job_type + '/upi-install-powervs-sno/finished.json'
-        
-        # temporary fix for getting cluster deployment status of jobs where clusters are deployed by upi
-        if "4.16-ocp-e2e-ovn-remote-libvirt-ppc64le" in spy_link:
+
+        if version>=4.16:
             job_log_url = PROW_VIEW_URL + spy_link[8:] + '/artifacts/' + job_type + '/upi-install-' + job_platform +'/finished.json'
+
         try:
             response = requests.get(job_log_url, verify=False, timeout=15)
             if response.status_code == 200:
@@ -565,13 +571,15 @@ def job_classifier(spy_link):
     if match:
         job_type = match.group(0)
         job_type = job_type.rstrip('/')
+    
     job_platform = "mce"
     if spy_link.find("powervs") != -1:
         job_platform = "powervs"
     elif spy_link.find("libvirt") != -1:
         job_platform = "libvirt"
     elif spy_link.find("sno") != -1:
         job_platform = "sno"
+    
     return job_type,job_platform
 
 

p_auxillary.json

@@ -4,24 +4,30 @@
     "4.14 ecosystem": "periodic-ci-openshift-multiarch-master-nightly-4.14-ocp-image-ecosystem-ovn-remote-libvirt-ppc64le",
     "4.15 ecosystem": "periodic-ci-openshift-multiarch-master-nightly-4.15-ocp-image-ecosystem-ovn-remote-libvirt-ppc64le",
     "4.16 ecosystem": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-image-ecosystem-ovn-remote-libvirt-ppc64le",
+    "4.17 ecosystem": "periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-image-ecosystem-ovn-remote-libvirt-multi-p-p",
     "4.12 jenkins": "periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-jenkins-e2e-ovn-remote-libvirt-ppc64le",
     "4.13 jenkins": "periodic-ci-openshift-multiarch-master-nightly-4.13-ocp-jenkins-e2e-ovn-remote-libvirt-ppc64le",
     "4.14 jenkins": "periodic-ci-openshift-multiarch-master-nightly-4.14-ocp-jenkins-e2e-ovn-remote-libvirt-ppc64le",
     "4.15 jenkins": "periodic-ci-openshift-multiarch-master-nightly-4.15-ocp-jenkins-e2e-ovn-remote-libvirt-ppc64le",
     "4.16 jenkins": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-jenkins-e2e-ovn-remote-libvirt-ppc64le",
+    "4.17 jenkins": "periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-jenkins-e2e-ovn-remote-libvirt-multi-p-p",
     "4.12 fips": "periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-fips-ovn-remote-libvirt-ppc64le",
     "4.13 fips": "periodic-ci-openshift-multiarch-master-nightly-4.13-ocp-fips-ovn-remote-libvirt-ppc64le",
     "4.14 fips": "periodic-ci-openshift-multiarch-master-nightly-4.14-ocp-fips-ovn-remote-libvirt-ppc64le",
     "4.15 fips": "periodic-ci-openshift-multiarch-master-nightly-4.15-ocp-fips-ovn-remote-libvirt-ppc64le",
     "4.16 fips": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-fips-ovn-remote-libvirt-ppc64le",
+    "4.17 fips": "periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-fips-ovn-remote-libvirt-multi-p-p",
     "4.12 serial": "periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-e2e-serial-ovn-remote-libvirt-ppc64le",
     "4.13 serial": "periodic-ci-openshift-multiarch-master-nightly-4.13-ocp-e2e-serial-ovn-remote-libvirt-ppc64le",
     "4.14 serial": "periodic-ci-openshift-multiarch-master-nightly-4.14-ocp-e2e-serial-ovn-remote-libvirt-ppc64le",
     "4.15 serial": "periodic-ci-openshift-multiarch-master-nightly-4.15-ocp-e2e-serial-ovn-remote-libvirt-ppc64le",
     "4.16 serial": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-e2e-serial-ovn-remote-libvirt-ppc64le",
+    "4.17 serial": "periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-e2e-serial-ovn-remote-libvirt-multi-p-p",
     "4.12 compact": "periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-e2e-compact-ovn-remote-libvirt-ppc64le",
     "4.13 compact": "periodic-ci-openshift-multiarch-master-nightly-4.13-ocp-e2e-compact-ovn-remote-libvirt-ppc64le",
     "4.14 compact": "periodic-ci-openshift-multiarch-master-nightly-4.14-ocp-e2e-compact-ovn-remote-libvirt-ppc64le",
     "4.15 compact": "periodic-ci-openshift-multiarch-master-nightly-4.15-ocp-e2e-compact-ovn-remote-libvirt-ppc64le",
-    "4.16 compact": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-e2e-compact-ovn-remote-libvirt-ppc64le"
+    "4.16 compact": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-e2e-compact-ovn-remote-libvirt-ppc64le",
+    "4.17 compact": "periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-e2e-compact-ovn-remote-libvirt-multi-p-p"
+
 }

p_periodic.json

@@ -1,5 +1,4 @@
 {
-    "4.11 libvirt": "periodic-ci-openshift-multiarch-master-nightly-4.11-ocp-e2e-remote-libvirt-ppc64le",
     "4.11 to 4.12 upgrade": "periodic-ci-openshift-multiarch-master-nightly-4.12-upgrade-from-nightly-4.11-ocp-ovn-remote-libvirt-ppc64le",
     "4.12 libvirt": "periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-e2e-ovn-remote-libvirt-ppc64le",
     "4.12 to 4.13 upgrade": "periodic-ci-openshift-multiarch-master-nightly-4.13-upgrade-from-nightly-4.12-ocp-ovn-remote-libvirt-ppc64le",
@@ -21,8 +20,9 @@
     "4.16 heavy build": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-heavy-build-ovn-remote-libvirt-ppc64le",
     "4.16 to 4.17 upgrade":"periodic-ci-openshift-multiarch-master-nightly-4.17-upgrade-from-nightly-4.16-ocp-ovn-remote-libvirt-multi-p-p",
     "4.17 libvirt": "periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-e2e-ovn-remote-libvirt-ppc64le",
+    "4.17 libvirt multi":"periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-e2e-ovn-remote-libvirt-multi-p-p",
     "4.17 powervs capi":"periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-e2e-ovn-powervs-capi-multi-p-p",
-    "4.17 powervs": "periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-e2e-ovn-powervs-original-multi-p-p",
+    "4.17 heavy build multi":"periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-heavy-build-ovn-remote-libvirt-multi-p-p",
     "4.17 heavy build": "periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-heavy-build-ovn-remote-libvirt-ppc64le",
     "4.14 MCE":"periodic-ci-openshift-hypershift-release-4.14-periodics-mce-e2e-mce-power-conformance",
     "4.15 MCE": "periodic-ci-openshift-hypershift-release-4.15-periodics-mce-e2e-power-ovn-conformance",