From c28b9b9bc37ccdcd4d449a0a4d95989c5dd58346 Mon Sep 17 00:00:00 2001
From: manchandavishal <manchandavishal143@gmail.com>
Date: Tue, 4 Aug 2020 06:11:08 +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.
Story: #2007865
Task: #40187

[1] https://governance.openstack.org/tc/goals/selected/victoria/migrate-ci-cd-jobs-to-ubuntu-focal

Change-Id: I81c150a9abc53242dfefd18c6c0ebc20c0484073
---
 .zuul.d/nodejs-jobs.yaml | 4 ++--
 lower-constraints.txt    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.zuul.d/nodejs-jobs.yaml b/.zuul.d/nodejs-jobs.yaml
index 8c4abebb0e..4273829d93 100644
--- a/.zuul.d/nodejs-jobs.yaml
+++ b/.zuul.d/nodejs-jobs.yaml
@@ -6,7 +6,7 @@
     vars:
       node_version: 10
       tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
     pre-run: playbooks/horizon-nodejs/pre.yaml
     required-projects:
       - openstack/horizon
@@ -21,7 +21,7 @@
       node_version: 10
       tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
     pre-run: playbooks/horizon-nodejs/pre.yaml
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
     required-projects:
       - openstack/horizon
       - openstack/requirements
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 9cfddbe127..98ee6a1413 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -5,14 +5,14 @@ asn1crypto==0.23.0
 Babel==2.3.4
 bandit==1.4.0
 cachetools==2.0.0
-cffi==1.7.0
+cffi==1.14.0
 chardet==3.0.4
 cliff==2.8.0
 cmd2==0.8.0
 colorama==0.3.9
 contextlib2==0.4.0
 coverage==4.0
-cryptography==2.1
+cryptography==3.0
 debtcollector==1.2.0
 decorator==3.4.0
 deprecation==1.0
@@ -81,7 +81,7 @@ pyflakes==2.1.0
 Pygments==2.2.0
 pyinotify==0.9.6
 pymongo==3.0.2
-pyOpenSSL==17.1.0
+pyOpenSSL==19.1.0
 pyparsing==2.1.0
 pyperclip==1.5.27
 pyScss==1.3.7