From patchwork Tue Jul 3 06:37:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Black X-Patchwork-Id: 942299 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.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41QPVY5j5dz9s1B for ; Wed, 11 Jul 2018 13:21:25 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41QPVY4MsDzDrTs for ; Wed, 11 Jul 2018 13:21:25 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=daniel@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.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 41QPVT0qvPzDr1S for ; Wed, 11 Jul 2018 13:21:20 +1000 (AEST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w6B3JGoB009345 for ; Tue, 10 Jul 2018 23:21:18 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2k57984pbu-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 10 Jul 2018 23:21:18 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 11 Jul 2018 04:21:16 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 11 Jul 2018 04:21:14 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w6B3LDE635389688 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 11 Jul 2018 03:21:13 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8D31611C052 for ; Wed, 11 Jul 2018 06:21:35 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3BE1A11C058 for ; Wed, 11 Jul 2018 06:21:35 +0100 (BST) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Wed, 11 Jul 2018 06:21:35 +0100 (BST) Received: from volution.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 1CCFCA01E1 for ; Wed, 11 Jul 2018 13:21:10 +1000 (AEST) X-Sieve: CMU Sieve 2.3 X-Virus-Scanned: amavisd-new at linux.ibm.com X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-9999 required=6.2 tests=[ALL_TRUSTED=-1] autolearn=disabled From: Daniel Black (by way of Daniel Black ) To: patchwork@lists.ozlabs.org Date: Tue, 3 Jul 2018 16:37:49 +1000 X-Mailer: git-send-email 2.17.1 Resent-Date: Wed, 11 Jul 2018 13:21:08 +1000 Resent-From: Daniel Black Subject: [PATCH 1/3] travis: test against postgresql 10 Resent-Message-ID: <20180711132108.796d0135@volution.ozlabs.ibm.com> Resent-To: patchwork@lists.ozlabs.org X-TM-AS-GCONF: 00 x-cbid: 18071103-0020-0000-0000-000002A52C91 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18071103-0021-0000-0000-000020F16FC5 Message-Id: <20180703063751.12068-1-daniel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-10_09:, , 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-1806210000 definitions=main-1807110031 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Signed-off-by: Daniel Black --- .travis.yml | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cb983f..d61b255 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,14 +23,55 @@ env: global: - PW_TEST_DB_PASS="" +matrix: + include: + - addons: + postgresql: "10" + apt: + packages: + - postgresql-10 + - postgresql-client-10 + env: + - PGPORT=5433 + - PW_TEST_DB_PORT=5433 + - PW_TEST_DB_TYPE=postgres + - PW_TEST_DB_USER=travis + - PW_TEST_DB_PASS="" + python: 3.6 + sudo: true + before_install: + - sudo -u postgres psql -c "grant ALL on DATABASE postgres to travis WITH GRANT OPTION;" + - env: + - PGPORT=5432 + - PW_TEST_DB_PORT=5432 + - PW_TEST_DB_TYPE=postgres + - PW_TEST_DB_USER=travis + - PW_TEST_DB_PASS="" + python: 3.6 + addons: + postgresql: "9.6" + apt: + packages: + - postgresql-9.6 + - postgresql-client-9.6 + + before_script: - - mysql -e 'create database patchwork character set utf8;' - - psql -c "create database patchwork with ENCODING = 'UTF8';" -U postgres + - if [[ $PW_TEST_DB_TYPE == mysql ]]; then mysql -e 'create database patchwork character set utf8;'; fi + - if [[ $PW_TEST_DB_TYPE == postgres ]]; then psql -c "create database patchwork with ENCODING = 'UTF8';" -U $PW_TEST_DB_USER; fi install: - pip install tox-travis script: + - > + if [[ $PW_TEST_DB_TYPE == mysql ]]; + then + mysql -e 'SELECT VERSION(), CURRENT_USER();' -u $PW_TEST_DB_USER patchwork; + else + psql -c "SELECT VERSION(), CURRENT_USER, current_database()" -U $PW_TEST_DB_USER patchwork; + psql -c "SELECT VERSION(), CURRENT_USER, current_database()" -U $PW_TEST_DB_USER postgres; + fi - tox - tox -e coverage