openstack/zaqar
Code Issues Proposed changes

[goal] Migrate testing to ubuntu focal

Browse Source 
As per victoria cycle testing runtime and community goal[1]
we need to migrate upstream CI/CD to Ubuntu Focal(20.04).

Fixing:
- bug#1885825
Fix user creation with GRANT in MySQL 8.0(Ubuntu Focal)
Ubuntu Focal (20.04) has mysql 8.0 and with mysql 8.0 there
is no implicit user creation with GRANT. We need to
create the user first before using GRANT command.

- bug#1886298
Bump the lower constraints for required deps which added python3.8 support
in their later version.

Co-Author: wanghao <sxmatch1986@gmail.com>

Story: #2007865
Task: #40229

Closes-Bug: #1885825

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

Change-Id: Ic15dfe480e4d34c3ba102b65153fab1af787bd67
This commit is contained in:
Ghanshyam Mann 2020-08-03 22:20:27 -05:00
parent 98ae5dac80
commit e35f9ad8d3
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lower-constraints.txt
View File

@ -1,10 +1,10 @@
alembic==0.8.10 alembic==0.8.10
autobahn==0.17.1 autobahn==20.7.1
Babel==2.3.4 Babel==2.3.4
coverage==4.0 coverage==4.0
ddt==1.0.1 ddt==1.0.1
doc8==0.6.0 doc8==0.6.0
dogpile.cache==0.6.2 dogpile.cache==1.0.2
enum34==1.0.4;python_version=='2.7' enum34==1.0.4;python_version=='2.7'
falcon==1.1.0 falcon==1.1.0
fixtures==3.0.0 fixtures==3.0.0
@ -22,7 +22,7 @@ os-testr==1.0.0
oslo.cache==1.26.0 oslo.cache==1.26.0
oslo.config==5.2.0 oslo.config==5.2.0
oslo.context==2.19.2 oslo.context==2.19.2
oslo.db==4.27.0 oslo.db==6.0.0
oslo.i18n==3.15.3 oslo.i18n==3.15.3
oslo.log==3.36.0 oslo.log==3.36.0
oslo.messaging==5.29.0 oslo.messaging==5.29.0
@ -38,20 +38,20 @@ osprofiler==1.4.0
pbr==2.0.0 pbr==2.0.0
Pygments==2.2.0 Pygments==2.2.0
pymongo==3.6.0 pymongo==3.6.0
PyMySQL==0.7.6 PyMySQL==0.8.0
python-keystoneclient==3.8.0 python-keystoneclient==3.8.0
python-memcached==1.56 python-memcached==1.56
python-subunit==1.0.0 python-subunit==1.0.0
python-swiftclient==3.2.0 python-swiftclient==3.2.0
pytz==2013.6 pytz==2013.6
PyYAML==3.12 PyYAML==3.13
redis==3.0.0 redis==3.0.0
requests==2.14.2 requests==2.14.2
requestsexceptions==1.2.0 requestsexceptions==1.2.0
restructuredtext-lint==1.1.1 restructuredtext-lint==1.1.1
rfc3986==0.3.1 rfc3986==0.3.1
six==1.10.0 six==1.10.0
SQLAlchemy==1.0.10 SQLAlchemy==1.3.19
sqlalchemy-migrate==0.11.0 sqlalchemy-migrate==0.11.0
stestr==2.0.0 stestr==2.0.0
stevedore==1.20.0 stevedore==1.20.0

6
requirements.txt
View File

@ -18,7 +18,7 @@ six>=1.10.0 # MIT
oslo.cache>=1.26.0 # Apache-2.0 oslo.cache>=1.26.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0
oslo.context>=2.19.2 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0
oslo.db>=4.27.0 # Apache-2.0 oslo.db>=6.0.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0
oslo.messaging>=5.29.0 # Apache-2.0 oslo.messaging>=5.29.0 # Apache-2.0
@ -28,7 +28,7 @@ oslo.upgradecheck>=0.1.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0
oslo.policy>=1.30.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.3.19 # MIT
autobahn>=0.17.1 # MIT License autobahn>=20.7.1 # MIT License
requests>=2.14.2 # Apache-2.0 requests>=2.14.2 # Apache-2.0
futurist>=1.2.0 # Apache-2.0 futurist>=1.2.0 # Apache-2.0

3
test-requirements.txt
View File

@ -12,7 +12,7 @@ redis>=3.0.0 # MIT
pymongo>=3.6.0 # Apache-2.0 pymongo>=3.6.0 # Apache-2.0
python-swiftclient>=3.2.0 # Apache-2.0 python-swiftclient>=3.2.0 # Apache-2.0
websocket-client>=0.44.0 # LGPLv2+ websocket-client>=0.44.0 # LGPLv2+
PyMySQL>=0.7.6 # MIT License PyMySQL>=0.8.0 # MIT License
# Unit testing # Unit testing
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
@ -23,7 +23,6 @@ fixtures>=3.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT
oslo.db>=4.27.0 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD testresources>=2.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
stestr>=2.0.0 stestr>=2.0.0

4
tools/test-setup.sh
View File

@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW
sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e " sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
DELETE FROM mysql.user WHERE User=''; DELETE FROM mysql.user WHERE User='';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
GRANT ALL PRIVILEGES ON *.* CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW';
TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;" GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;"
# Now create our database. # Now create our database.
mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e " mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "