From patchwork Fri Feb 1 06:17:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 1034599 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43rRjQ42YYz9sDX for ; Fri, 1 Feb 2019 17:17:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=au1.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 43rRjQ2pTbzDqg8 for ; Fri, 1 Feb 2019 17:17:46 +1100 (AEDT) X-Original-To: snowpatch@lists.ozlabs.org Delivered-To: snowpatch@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=au1.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=andrew.donnellan@au1.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=au1.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 43rRjB1MJVzDqfM for ; Fri, 1 Feb 2019 17:17:33 +1100 (AEDT) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1163pVr051498 for ; Fri, 1 Feb 2019 01:17:31 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qce52e68t-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 01 Feb 2019 01:17:31 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 1 Feb 2019 06:17:29 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 1 Feb 2019 06:17:27 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x116HQqj7209438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 1 Feb 2019 06:17:26 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 555DA52059 for ; Fri, 1 Feb 2019 06:17:26 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 035B55204E for ; Fri, 1 Feb 2019 06:17:26 +0000 (GMT) Received: from intelligence.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id D0E37A0272 for ; Fri, 1 Feb 2019 17:17:24 +1100 (AEDT) From: Andrew Donnellan To: snowpatch@lists.ozlabs.org Date: Fri, 1 Feb 2019 17:17:13 +1100 X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190201061714.7110-1-andrew.donnellan@au1.ibm.com> References: <20190201061714.7110-1-andrew.donnellan@au1.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19020106-0016-0000-0000-0000024F2172 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19020106-0017-0000-0000-000032A9229D Message-Id: <20190201061714.7110-4-andrew.donnellan@au1.ibm.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-02-01_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902010044 Subject: [snowpatch] [PATCH 4/5] ci: Move CIBackend and BuildStatus to separate module X-BeenThere: snowpatch@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Continuous Integration for patch-based workflows List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: snowpatch-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "snowpatch" Move CIBackend and BuildStatus to a separate module as we're eventually going to use it for non-Jenkins things. Signed-off-by: Andrew Donnellan --- src/ci.rs | 26 ++++++++++++++++++++++++++ src/jenkins.rs | 14 ++------------ src/main.rs | 5 ++++- 3 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 src/ci.rs diff --git a/src/ci.rs b/src/ci.rs new file mode 100644 index 000000000000..7d21edb7662f --- /dev/null +++ b/src/ci.rs @@ -0,0 +1,26 @@ +// +// snowpatch - continuous integration for patch-based workflows +// +// Copyright (C) 2016-2019 IBM Corporation +// Authors: +// Russell Currey +// Andrew Donnellan +// +// This program is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the Free +// Software Foundation; either version 2 of the License, or (at your option) +// any later version. +// +// ci.rs - CI backend interface definitions +// + +#[derive(Eq, PartialEq)] +pub enum BuildStatus { + Running, + Done, +} + +pub trait CIBackend { + fn start_test(&self, job_name: &str, params: Vec<(&str, &str)>) + -> Result; +} diff --git a/src/jenkins.rs b/src/jenkins.rs index c76561f1fda2..4738fca7a069 100644 --- a/src/jenkins.rs +++ b/src/jenkins.rs @@ -35,6 +35,8 @@ use reqwest::header::{HeaderMap, AUTHORIZATION, LOCATION}; use reqwest::{Client, IntoUrl, Response}; use serde_json::{self, Value}; +use ci::{BuildStatus, CIBackend}; + use patchwork::TestState; // Constants @@ -42,12 +44,6 @@ const JENKINS_POLLING_INTERVAL: u64 = 5000; // Polling interval in milliseconds // Jenkins API definitions -pub trait CIBackend { - // TODO: Separate out - fn start_test(&self, job_name: &str, params: Vec<(&str, &str)>) - -> Result; -} - pub struct JenkinsBackend { pub base_url: String, pub reqwest_client: Arc, @@ -85,12 +81,6 @@ impl CIBackend for JenkinsBackend { } } -#[derive(Eq, PartialEq)] -pub enum BuildStatus { - Running, - Done, -} - impl JenkinsBackend { fn headers(&self) -> HeaderMap { let mut headers = HeaderMap::new(); diff --git a/src/main.rs b/src/main.rs index 19989c87cb01..b6c756815595 100644 --- a/src/main.rs +++ b/src/main.rs @@ -58,8 +58,11 @@ use std::time::Duration; mod patchwork; use patchwork::{PatchworkServer, TestResult, TestState}; +mod ci; +use ci::CIBackend; + mod jenkins; -use jenkins::{CIBackend, JenkinsBackend}; +use jenkins::JenkinsBackend; mod settings; use settings::{Config, Project};