Install neutron-lib-tests

It's required for running neutron unit tests successfully. Change-Id: I3732664644f2d6c8be5a93d0cf9c75171aac6fd4
redhat-openstack · Sep 20, 2018 · 1f75124 · 1f75124
1 parent 8b97be7
commit 1f75124
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/components_config/14/neutron/component.yml b/components_config/14/neutron/component.yml
@@ -17,6 +17,7 @@ unittest:
                 python-pyroute2,
                 python-mock,
                 python-oslotest,
+                python2-neutron-lib-tests,
                 python-testresources, 
                 python-testscenarios,
                 python-pep8,
@@ -27,9 +28,9 @@ unittest:
     remove_rpm: [ python-neutron ]
     archive_run: ''
     run: >
+      sudo pip install -U "hacking";
       sudo pip install oslo.db==4.38;
       sudo yum install -y https://bitbucket.org/abregman/bregman-rpms/downloads/libsqlite3-0-3.8.3-2.1.x86_64.rpm https://bitbucket.org/abregman/bregman-rpms/downloads/sqlite3-3.8.3-2.1.x86_64.rpm;
-      sudo yum install -y https://bitbucket.org/abregman/bregman-rpms/downloads/python2-hacking-0.11.0-1.el7.noarch.rpm;
       tox --sitepackages -v -e py27 2>&1 | tee ../logs/testrun.log;
 
 # FAIL_ON_MISSING_DEPS is disabled because we are not testing postgresql.
@@ -38,7 +39,7 @@ dsvm-functional:
     rpm_deps: [ openstack-neutron, openstack-neutron-openvswitch, python-testresources,
                 python-oslotest, bridge-utils, nmap-ncat, ebtables, openstack-selinux,
                 mysql-server, python-ryu, python-novaclient, python-keystonemiddleware,
-                psmisc, nfs-utils, selinux-policy, python-os-testr ]
+                psmisc, nfs-utils, selinux-policy, python-os-testr, python2-neutron-lib-tests ]
     remove_rpm: []
     archive_run: tar zcvf /home/cloud-user/logs/functional-tests.tar.gz /opt/stack/logs/dsvm-functional-logs;
     run: >
@@ -70,7 +71,7 @@ dsvm-fullstack:
     rpm_deps: [ openstack-neutron, openstack-neutron-openvswitch, python-testresources,
                 python-oslotest, bridge-utils, nmap-ncat, ebtables, openstack-selinux,
                 mysql-server, python-ryu, python-novaclient, python-keystonemiddleware,
-                psmisc, rabbitmq-server, selinux-policy, python-os-testr ]
+                psmisc, rabbitmq-server, selinux-policy, python-os-testr, python2-neutron-lib-tests ]
     remove_rpm: []
     archive_run: ''
     run: >

diff --git a/roles/patch_rpm/tasks/main.yml b/roles/patch_rpm/tasks/main.yml
@@ -16,6 +16,10 @@
   tags:
     - skip_ansible_lint
 
+- name: Fix python-cryptography conflict with python2-cryptography
+  set_fact:
+      python_cryptography_pkg: "{{ (component.version >= '13') | ternary('python2-cryptography', 'python-cryptography') }}"
+
 # Although pyrpkg pulled by rhpkg, we install it directly because at the moment, an older
 # version of pyrpkg is pulled (1.40) while we need a newer version (1.43)
 - name: Install packages required for patching
@@ -28,7 +32,7 @@
     - 'ca-certificates'
     - 'createrepo'
     - 'python-pip'
-    - 'python-cryptography'
+    - "{{ python_cryptography_pkg }}"
     - 'python-devel'
     - 'libffi-devel'
     - 'mock'