From patchwork Fri Feb 1 06:17:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 1034598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43rRjN59b2z9sDr for ; Fri, 1 Feb 2019 17:17:44 +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 43rRjN06vJzDqfK for ; Fri, 1 Feb 2019 17:17:44 +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 43rRj95gY0zDqfL for ; Fri, 1 Feb 2019 17:17:33 +1100 (AEDT) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1165f4t116031 for ; Fri, 1 Feb 2019 01:17:31 -0500 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qcghtge07-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 01 Feb 2019 01:17:30 -0500 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 1 Feb 2019 06:17:28 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp01.uk.ibm.com (192.168.101.131) 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 d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x116HQLk22216826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 1 Feb 2019 06:17:26 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 62BFF42049 for ; Fri, 1 Feb 2019 06:17:26 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0F9934203F for ; Fri, 1 Feb 2019 06:17:26 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP 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 C4444A0268 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:12 +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-4275-0000-0000-00000308B34C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19020106-4276-0000-0000-00003816BFEF Message-Id: <20190201061714.7110-3-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=727 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902010044 Subject: [snowpatch] [PATCH 3/5] jenkins: Rename JenkinsBuildStatus to BuildStatus 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" There's no reason JenkinsBuildStatus needs to be Jenkins-specific at the moment. Signed-off-by: Andrew Donnellan --- src/jenkins.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/jenkins.rs b/src/jenkins.rs index 547c396c3513..c76561f1fda2 100644 --- a/src/jenkins.rs +++ b/src/jenkins.rs @@ -86,7 +86,7 @@ impl CIBackend for JenkinsBackend { } #[derive(Eq, PartialEq)] -pub enum JenkinsBuildStatus { +pub enum BuildStatus { Running, Done, } @@ -166,10 +166,10 @@ impl JenkinsBackend { } } - pub fn get_build_status(&self, build_handle: &str) -> Result> { + pub fn get_build_status(&self, build_handle: &str) -> Result> { match self.get_api_json_object(build_handle)?["building"].as_bool() { - Some(true) => Ok(JenkinsBuildStatus::Running), - Some(false) => Ok(JenkinsBuildStatus::Done), + Some(true) => Ok(BuildStatus::Running), + Some(false) => Ok(BuildStatus::Done), None => Err("Error getting build status".into()), } } @@ -230,11 +230,11 @@ impl JenkinsBackend { } } - pub fn wait_build(&self, build_handle: &str) -> Result> { + pub fn wait_build(&self, build_handle: &str) -> Result> { // TODO: Implement a timeout? - while self.get_build_status(build_handle)? != JenkinsBuildStatus::Done { + while self.get_build_status(build_handle)? != BuildStatus::Done { sleep(Duration::from_millis(JENKINS_POLLING_INTERVAL)); } - Ok(JenkinsBuildStatus::Done) + Ok(BuildStatus::Done) } }