From 279195ddeb8e459a5931430f0841724ba6c06db1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 26 Jan 2020 14:25:05 +0100 Subject: docker build, deploy: Switch tooling to python3 Python2.7 is deprecated and packages are starting to enforce py3 usage (e.g. dockermake recently started supporting only 3.6). Switch pipenv to python3, but allow pyhton3.5 by pinning dockermake to v0.8 since Ubuntu Xenial does not have python3.6 easily available. While at it, switch deploy tooling (PDF/IDF configuration parsing) from python2 to pyhton3 too and fix some jumphost package requirements. Change-Id: Id66d08d0f51a1bc35c1d78c1956df832a5536bde Signed-off-by: Alexandru Avadanii (cherry picked from commit fccf558f0c55c0b26448961a97d8edae3dd7db4d) --- ...003-OPNFV-package-installation-Ubuntu-user.patch | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch') diff --git a/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch index 34db789a2..75da21633 100644 --- a/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch +++ b/mcp/patches/docker/0003-OPNFV-package-installation-Ubuntu-user.patch @@ -18,11 +18,15 @@ Subject: [PATCH] OPNFV package installation, Ubuntu user have to switch to 'root' login; * Preinstall `salt_minion_dependency_packages` and `salt_minion_reclass_dependencies`; +* Pin dockermake to v0.8 to allow using python3.5 for virtualenv, + since python 3.6 is not easily available for Ubuntu Xenial + jump/build hosts. Signed-off-by: Alexandru Avadanii --- DockerMake.yml | 38 +++++++++++++++++++++++++++++++++++++- - 1 file changed, 37 insertions(+), 1 deletion(-) + Pipfile | 4 ++-- + 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/DockerMake.yml b/DockerMake.yml index 2c75586..9ab7195 100644 @@ -87,3 +91,18 @@ index 2c75586..9ab7195 100644 wheel: requires: - base +diff --git a/Pipfile b/Pipfile +index d3e8d66..340e125 100644 +--- a/Pipfile ++++ b/Pipfile +@@ -7,8 +7,8 @@ name = "pypi" + + [packages] + pygithub = "*" +-docker-make = {git = "https://github.com/avirshup/DockerMake"} +-dockermake = {git = "https://github.com/avirshup/DockerMake"} ++docker-make = {git = "https://github.com/avirshup/DockerMake", ref = "aeac230fd5ab468d806bf42b120aa97f91eb40a2"} ++dockermake = {git = "https://github.com/avirshup/DockerMake", ref = "aeac230fd5ab468d806bf42b120aa97f91eb40a2"} + + [requires] + python_version = "3.6" -- cgit 1.2.3-korg