diff --git a/monitor.py b/monitor.py index 46c2f64..dbc5939 100644 --- a/monitor.py +++ b/monitor.py @@ -562,12 +562,11 @@ def job_classifier(spy_link): job_type(string): It is a important keyword used while constructing url to access the artifacts. job_platform(string): The infrastructure where the cluster is deployed (ex: libvirt, powervs etc). ''' - + job_type = "" pattern = r'ocp.*?/' - if "mce" in spy_link or "capi" in spy_link: + if "mce" in spy_link: pattern = r'e2e.*?/' match = re.search(pattern,spy_link) - if match: job_type = match.group(0) job_type = job_type.rstrip('/') diff --git a/p_periodic.json b/p_periodic.json index d2ed614..1137fe6 100644 --- a/p_periodic.json +++ b/p_periodic.json @@ -18,14 +18,14 @@ "4.16 libvirt": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-e2e-ovn-remote-libvirt-ppc64le", "4.16 powervs": "periodic-ci-openshift-multiarch-master-nightly-4.16-ocp-e2e-ovn-ppc64le-powervs-original", "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.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 heavy build multi":"periodic-ci-openshift-multiarch-master-nightly-4.17-ocp-heavy-build-ovn-remote-libvirt-multi-p-p", + "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 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.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", "4.16 MCE": "periodic-ci-openshift-hypershift-release-4.16-periodics-mce-e2e-power-ovn-conformance", "4.14 SNO": "periodic-ci-openshift-multiarch-master-nightly-4.14-ocp-e2e-sno-power" -} +} \ No newline at end of file diff --git a/tracker.py b/tracker.py index cc13339..66b258f 100644 --- a/tracker.py +++ b/tracker.py @@ -11,6 +11,10 @@ def filter_latest_ci_lv1(config_data,n_build): tc_failure_jobs = [] huge_tc_failure_jobs = [] job_list = monitor.get_n_recent_jobs(ci_link,n_build) + print(job_list) + if isinstance(job_list, str): + print(job_list + " for ", ci_name) + return updated_ci_dict for job in job_list: cluster_status=monitor.cluster_deploy_status(job) job_type,_=monitor.job_classifier(job)