From 7b1adbd7be137ff3e67fc051b4b1ffe8745f46c1 Mon Sep 17 00:00:00 2001 From: manchandavishal Date: Tue, 4 Aug 2020 13:53:58 +0000 Subject: [PATCH] [goal] Migrate testing to ubuntu focal As per victoria cycle testing runtime and community goal[1] we need to migrate upstream CI/CD to Ubuntu Focal(20.04). Fixing: Closes-Bug: #1886298 Bump the lower constraints for required deps which added python3.8 support in their later version. This patch update python version to py38 in package.json and karma.conf.js as py36 is not available on focal. It also adds libfontconfig1 in bindep.txt as phantomjs requires libfontconfig[2]. Story: #2007865 Task: #40182 Depends-On: https://review.opendev.org/#/c/744647/ [1] https://governance.openstack.org/tc/goals/selected/victoria/migrate-ci-cd-jobs-to-ubuntu-focal [2] https://www.npmjs.com/package/phantomjs-prebuilt#linux-note Change-Id: I6d2689cfbe019a5c6ee22ff3f3666981502f2ce4 --- bindep.txt | 4 ++++ karma.conf.js | 2 +- lower-constraints.txt | 2 +- package.json | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 bindep.txt diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 0000000..35fc04e --- /dev/null +++ b/bindep.txt @@ -0,0 +1,4 @@ +# This is a cross-platform list tracking distribution packages needed for install and tests; +# see https://docs.openstack.org/infra/bindep/ for additional information. + +libfontconfig1 [nodejs platform:dpkg] diff --git a/karma.conf.js b/karma.conf.js index eb4eb88..a177ce3 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -20,7 +20,7 @@ var path = require('path'); module.exports = function (config) { // This tox venv is setup in the post-install npm step - var toxPath = '.tox/py36/lib/python3.6/site-packages/'; + var toxPath = '.tox/py38/lib/python3.8/site-packages/'; var xstaticPath = toxPath + 'xstatic/pkg/'; config.set({ diff --git a/lower-constraints.txt b/lower-constraints.txt index 8c24036..838433d 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -3,7 +3,7 @@ appdirs==1.4.3 asn1crypto==0.24.0 astroid==1.3.8 certifi==2018.1.18 -cffi==1.11.5 +cffi==1.14 chardet==3.0.4 cliff==2.11.0 cmd2==0.8.1 diff --git a/package.json b/package.json index 90dd47d..dc265b4 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,14 @@ "eslint": "1.10.3", "eslint-config-openstack": "1.2.4", "jasmine-core": "2.4.1", - "karma": "1.1.2", + "karma": "~1.1.2", "karma-chrome-launcher": "1.0.1", "karma-cli": "1.0.1", "karma-jasmine": "1.0.2", "karma-ng-html2js-preprocessor": "1.0.0" }, "scripts": { - "postinstall": "if [ ! -d .venv ]; then tox -epy36 --notest; fi", + "postinstall": "if [ ! -d .tox/py38 ]; then tox -epy38 --notest; fi", "lint": "eslint --no-color designatedashboard/static", "lintq": "eslint --quiet designatedashboard/static", "test": "karma start karma.conf.js --single-run"