From patchwork Mon Nov 21 07:07:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 697157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tMfnQ5jydz9t10 for ; Mon, 21 Nov 2016 18:07:54 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tMfnQ1X49zDvj1 for ; Mon, 21 Nov 2016 18:07:54 +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 3tMfnK2ZSpzDvj0 for ; Mon, 21 Nov 2016 18:07:48 +1100 (AEDT) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uAL747Nj146505 for ; Mon, 21 Nov 2016 02:07:44 -0500 Received: from e23smtp06.au.ibm.com (e23smtp06.au.ibm.com [202.81.31.148]) by mx0b-001b2d01.pphosted.com with ESMTP id 26tjxku2ge-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 21 Nov 2016 02:07:44 -0500 Received: from localhost by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Nov 2016 17:07:41 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 21 Nov 2016 17:07:39 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 286D93578052 for ; Mon, 21 Nov 2016 18:07:39 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id uAL77dcE3604858 for ; Mon, 21 Nov 2016 18:07:39 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id uAL77dTb008027 for ; Mon, 21 Nov 2016 18:07:39 +1100 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id uAL77c3m008024 for ; Mon, 21 Nov 2016 18:07:38 +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 99AF9A0135 for ; Mon, 21 Nov 2016 18:07:38 +1100 (AEDT) From: Andrew Donnellan To: snowpatch@lists.ozlabs.org Date: Mon, 21 Nov 2016 18:07:32 +1100 X-Mailer: git-send-email 2.10.2 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16112107-0040-0000-0000-000002C7ED87 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16112107-0041-0000-0000-00000BB9394A Message-Id: <20161121070732.6630-1-andrew.donnellan@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-11-21_05:, , 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-1609300000 definitions=main-1611210127 Subject: [snowpatch] [PATCH] jenkins: refactor to get rid of lifetime specifiers 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" Signed-off-by: Andrew Donnellan --- src/jenkins.rs | 11 ++++++----- src/main.rs | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/jenkins.rs b/src/jenkins.rs index 6dd0b93..f450243 100644 --- a/src/jenkins.rs +++ b/src/jenkins.rs @@ -27,6 +27,7 @@ extern crate rustc_serialize; use std::io::Read; use std::time::Duration; use std::thread::sleep; +use std::sync::Arc; use hyper::Client; use hyper::header::Location; @@ -41,13 +42,13 @@ pub trait CIBackend { // TODO: Separate out fn start_test(&self, job_name: &str, params: Vec<(&str, &str)>) -> Result; } -pub struct JenkinsBackend<'a> { - pub base_url: &'a str, - pub hyper_client: &'a Client, +pub struct JenkinsBackend { + pub base_url: String, + pub hyper_client: Arc, // TODO: Authentication } -impl<'a> CIBackend for JenkinsBackend<'a> { +impl CIBackend for JenkinsBackend { /// Start a Jenkins build /// /// # Failures @@ -76,7 +77,7 @@ pub enum JenkinsBuildStatus { Done, } -impl<'a> JenkinsBackend<'a> { +impl JenkinsBackend { fn get_api_json_object(&self, base_url: &str) -> rustc_serialize::json::Object { // TODO: Don't panic on failure, fail more gracefully let url = format!("{}api/json", base_url); diff --git a/src/main.rs b/src/main.rs index 57fd5ad..e1f1885 100644 --- a/src/main.rs +++ b/src/main.rs @@ -89,12 +89,12 @@ struct Args { flag_project: String, } -fn run_tests(settings: &Config, client: &Client, project: &Project, tag: &str, +fn run_tests(settings: &Config, client: Arc, project: &Project, tag: &str, branch_name: &str) -> Vec { let mut results: Vec = Vec::new(); let jenkins = JenkinsBackend { - base_url: &settings.jenkins.url, - hyper_client: &client, + base_url: settings.jenkins.url.clone(), + hyper_client: client, }; let project = project.clone(); for job_params in project.jobs.iter() { @@ -217,7 +217,7 @@ fn test_patch(settings: &Config, client: &Arc, project: &Project, path: // We've set up a remote branch, time to kick off tests let test = thread::Builder::new().name(tag.to_string()).spawn(move || { - return run_tests(&settings_clone, &client, &project, &tag, + return run_tests(&settings_clone, client, &project, &tag, &branch_name); }).unwrap(); results.append(&mut test.join().unwrap());