Fix ansible lint tests

On top of that, it bumps the version of bindep.txt
from the osa-tests repo, because the automatic bump
cannot merge without lint tests passing, and the
other way around. Moreover, we drop the 'force'
argument from zypper since we are not switching
package vendors anymore.

[hwoarang: Add patch from https://review.openstack.org/#/c/526128/
to unblock the gates]

Depends-On: I4ba16ea660907c3fb481a9e80d73b750c2f4c138
Change-Id: I67e44434d4b3eb07b8af5c12aaa807514518be4c

bindep.txt

@@ -22,8 +22,10 @@
 # using this file.
 #
 
+# The gcc compiler
+gcc
+
 # Base requirements for Ubuntu
-gcc               [platform:dpkg]
 git-core          [platform:dpkg]
 libssl-dev        [platform:dpkg]
 libffi-dev        [platform:dpkg]
@@ -35,13 +37,10 @@ python3-apt       [platform:dpkg]
 python3-dev       [platform:dpkg]
 
 # Base requirements for RPM distros
-gcc               [platform:rpm]
 gcc-c++           [platform:rpm]
 git               [platform:rpm]
-libffi-devel      [platform:rpm !platform:opensuseproject-42]
-libffi-devel-gcc5 [platform:opensuseproject-42]
-openssl-devel     [platform:redhat]
-libopenssl-devel  [platform:suse]
+libffi-devel      [platform:rpm]
+openssl-devel     [platform:rpm]
 python-devel      [platform:rpm]
 python2-dnf       [platform:fedora]
 

tasks/repo_build_install.yml

@@ -17,9 +17,6 @@
   package:
     name: "{{ repo_build_distro_packages }}"
     state: "{{ repo_build_package_state }}"
-    # We switch vendors in a few SUSE packages so we need to force the
-    # installation
-    force: "{{ (ansible_pkg_mgr == 'zypper' ) | ternary('yes', omit) }}"
     update_cache: "{{ (ansible_pkg_mgr == 'apt' or ansible_pkg_mgr == 'zypper') | ternary('yes', omit) }}"
     cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
   register: install_packages

tests/test-install-server.yml

@@ -45,6 +45,8 @@
       when:
         - _local_git_cache.stat is defined
         - not _local_git_cache.stat.exists
+      tags:
+        - skip_ansible_lint
 
     - name: Pre-cache the tempest git repository (from git source)
       git:
@@ -54,11 +56,15 @@
         update: yes
       become: yes
       become_user: "{{ repo_build_service_user_name }}"
+      tags:
+        - skip_ansible_lint
 
     - name: Intentionally set the keystone repo remote origin to github
-      shell: "git remote set-url origin https://github.com/openstack/keystone.git"
+      command: "git remote set-url origin https://github.com/openstack/keystone.git"
       args:
         chdir: "/var/www/repo/openstackgit/keystone"
+      tags:
+        - skip_ansible_lint
 
   vars_files:
     - test-vars.yml

tests/test-repo-build.yml

@@ -42,6 +42,7 @@
     - name: List the files in the venv folder
       command: ls -1 {{ repo_build_venv_dir }}/
       register: venv_folder_content
+      changed_when: false
     - name: Ensure that the keystone venv is present
       assert:
         that: "'keystone-{{ repo_build_release_tag }}-{{ ansible_architecture | lower }}.tgz' in venv_folder_content.stdout"
@@ -54,6 +55,7 @@
     - name: List the files in the git folder
       command: ls -1 /var/www/repo/openstackgit/
       register: git_folder_content
+      changed_when: false
     - name: Ensure that the keystone git repo is present
       assert:
         that: "'keystone' in git_folder_content.stdout"

tests/test-vars.yml

@@ -85,6 +85,7 @@ local_packages:
         - pyasn1-modules
         - pycrypto>=2.6
         - pyeclib
+        - pyldap
         - pylxd
         - pymongo
         - pymysql
@@ -97,7 +98,6 @@ local_packages:
         - python-heatclient
         - python-ironicclient
         - python-keystoneclient
-        - python-ldap
         - python-memcached>=1.56
         - python-neutronclient
         - python-novaclient
@@ -914,10 +914,10 @@ local_packages:
           - oslo.middleware
           - pbr
           - pycrypto
+          - pyldap
           - pymysql
           - pysaml2
           - python-keystoneclient
-          - python-ldap
           - python-memcached
           - python-openstackclient
           - repoze.lru
@@ -1253,10 +1253,10 @@ local_packages:
             - oslo.middleware
             - pbr
             - pycrypto
+            - pyldap
             - pymysql
             - pysaml2
             - python-keystoneclient
-            - python-ldap
             - python-memcached
             - python-openstackclient
             - repoze.lru