From patchwork Fri Feb 3 06:39:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 723422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vF6gR3NRkz9s75 for ; Fri, 3 Feb 2017 17:40:19 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vF6gR2dBBzDqBl for ; Fri, 3 Feb 2017 17:40:19 +1100 (AEDT) X-Original-To: snowpatch@lists.ozlabs.org Delivered-To: snowpatch@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vF6gM5msFzDqBZ for ; Fri, 3 Feb 2017 17:40:15 +1100 (AEDT) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v136XbeN020293 for ; Fri, 3 Feb 2017 01:40:13 -0500 Received: from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141]) by mx0b-001b2d01.pphosted.com with ESMTP id 28chxdx6tj-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 03 Feb 2017 01:40:12 -0500 Received: from localhost by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Feb 2017 16:40:10 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp08.au.ibm.com (202.81.31.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 3 Feb 2017 16:40:07 +1000 Received: from d23relay10.au.ibm.com (d23relay10.au.ibm.com [9.190.26.77]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 57AC82CE8046 for ; Fri, 3 Feb 2017 17:40:07 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v136dx0e34209950 for ; Fri, 3 Feb 2017 17:40:07 +1100 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v136dZwK016653 for ; Fri, 3 Feb 2017 17:39:35 +1100 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v136dZfo016139 for ; Fri, 3 Feb 2017 17:39:35 +1100 Received: from ajd.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id C6249A01EA for ; Fri, 3 Feb 2017 17:39:10 +1100 (AEDT) From: Andrew Donnellan To: snowpatch@lists.ozlabs.org Date: Fri, 3 Feb 2017 17:39:07 +1100 X-Mailer: git-send-email 2.11.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17020306-0048-0000-0000-000002018C2D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17020306-0049-0000-0000-000047783359 Message-Id: <20170203063907.12866-1-andrew.donnellan@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-03_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702030068 Subject: [snowpatch] [PATCH] jenkins: get build result X-BeenThere: snowpatch@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Continuous Integration for patch-based workflows List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: snowpatch-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "snowpatch" When a build completes, get the result (success, failure or unstable) from Jenkins, and use it to update Patchwork. Closes: #14 ("Submit Jenkins test results to patchwork") Signed-off-by: Andrew Donnellan --- for information only, already merged --- src/jenkins.rs | 15 +++++++++++++++ src/main.rs | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/jenkins.rs b/src/jenkins.rs index 1c63e75..0122a06 100644 --- a/src/jenkins.rs +++ b/src/jenkins.rs @@ -34,6 +34,8 @@ use hyper::client::{IntoUrl, RequestBuilder}; use hyper::header::{Headers, Basic, Authorization, Location}; use rustc_serialize::json::Json; +use patchwork::TestState; + // Constants const JENKINS_POLLING_INTERVAL: u64 = 5000; // Polling interval in milliseconds @@ -139,6 +141,19 @@ impl JenkinsBackend { } } + pub fn get_build_result(&self, build_url: &str) -> Option { + match self.get_api_json_object(build_url).get("result").unwrap() + .as_string() { + None => None, + Some(result) => match result { // TODO: Improve this... + "SUCCESS" => Some(TestState::success), + "FAILURE" => Some(TestState::failure), + "UNSTABLE" => Some(TestState::warning), + _ => Some(TestState::pending), + }, + } + } + pub fn wait_build(&self, build_url: &str) -> JenkinsBuildStatus { // TODO: Implement a timeout? while self.get_build_status(build_url) != JenkinsBuildStatus::Done { diff --git a/src/main.rs b/src/main.rs index 9909243..c1bf0bf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -131,10 +131,11 @@ fn run_tests(settings: &Config, client: Arc, project: &Project, tag: &st } debug!("Build URL: {}", build_url_real); jenkins.wait_build(&build_url_real); + let test_result = jenkins.get_build_result(&build_url_real).unwrap(); info!("Jenkins job for {}/{} complete.", branch_name, job_name); results.push(TestResult { test_name: format!("{}/{}", branch_name.to_string(), job_name.to_string()), - state: TestState::success, + state: test_result, url: None, // TODO: link to Jenkins job log summary: Some("TODO: get this summary from Jenkins".to_string()), });