From patchwork Mon Aug 6 06:56:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Black X-Patchwork-Id: 953726 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 41kT4m2vZMz9s0n for ; Mon, 6 Aug 2018 16:58:16 +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 41kT4m1cGJzF3HS for ; Mon, 6 Aug 2018 16:58:16 +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.158.5; 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 (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 41kT4c1G3kzF3HG for ; Mon, 6 Aug 2018 16:58:07 +1000 (AEST) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w766rrph125632 for ; Mon, 6 Aug 2018 02:58:04 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 2kpgd8t8d5-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Aug 2018 02:58:04 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Aug 2018 07:58:02 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 6 Aug 2018 07:57:59 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w766vxKL34537588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 6 Aug 2018 06:57:59 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7C75742045 for ; Mon, 6 Aug 2018 09:58:08 +0100 (BST) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2A39D42041 for ; Mon, 6 Aug 2018 09:58:08 +0100 (BST) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Mon, 6 Aug 2018 09:58:08 +0100 (BST) Received: from volution.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 31B6EA01A5; Mon, 6 Aug 2018 16:57:55 +1000 (AEST) From: Daniel Black To: patchwork@lists.ozlabs.org Subject: [PATCH v2 1/3] travis: test against postgresql 10 and 11 Date: Mon, 6 Aug 2018 16:56:37 +1000 X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703063751.12068-1-daniel@linux.ibm.com> References: <20180703063751.12068-1-daniel@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18080606-0008-0000-0000-0000025D8669 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080606-0009-0000-0000-000021C4349C Message-Id: <20180806065639.23094-1-daniel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-08-06_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-1807170000 definitions=main-1808060077 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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cb983f..58e0b08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,14 +23,61 @@ 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=5433 + - PW_TEST_DB_PORT=5433 + - PW_TEST_DB_TYPE=postgres + - PW_TEST_DB_USER=travis + - PW_TEST_DB_PASS="" + python: 3.6 + dist: trusty + addons: + postgresql: "11" + apt: + sources: + - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg 11' + key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' + packages: + - postgresql-11 + - postgresql-client-11 + sudo: true + before_install: + - sudo -u postgres psql -c "grant ALL on DATABASE postgres to travis WITH GRANT OPTION;" + + 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; + fi - tox - tox -e coverage