diff --git a/tests/pre.yml b/tests/pre.yml index 407e6b7..a88ef04 100644 --- a/tests/pre.yml +++ b/tests/pre.yml @@ -19,6 +19,12 @@ - "logs" - "logs/containers" + - include: pre_rhel.yml + when: ansible_os_family == 'RedHat' + + - include: pre_debian.yml + when: ansible_os_family == 'Debian' + - include: 'roles/{{coe}}/tasks/pre.yml' - name: Create symlink for all required projects diff --git a/tests/pre_rhel.yml b/tests/pre_rhel.yml index bf9955f..2c81e53 100644 --- a/tests/pre_rhel.yml +++ b/tests/pre_rhel.yml @@ -1,54 +1,8 @@ --- -- name: Add ASB repo for ansible-kubernetes-modules - become: true - yum_repository: - name: asb - description: Copr repo for ansible-service-broker-latest owned by @ansible-service-broker - file: asb - baseurl: https://copr-be.cloud.fedoraproject.org/results/@ansible-service-broker/ansible-service-broker-latest/epel-7-$basearch/ - gpgkey: https://copr-be.cloud.fedoraproject.org/results/@ansible-service-broker/ansible-service-broker-latest/pubkey.gpg - gpgcheck: true - enabled: true - skip_if_unavailable: true - repo_gpgcheck: false - -- name: Enable/Install epel-release/centos-release-openshift-origin - become: true - yum: - name: "{{item}}" - state: present - with_items: - - epel-release - - centos-release-openshift-origin - -# NOTE(flaper87): python-openshift requires a specific version of -# python-requests. We need to update it to the version in the asb repo, hence -# this step. We have to enable epel so we can meet the python2-pysocks -# dependency, which is a python-requests requirement. -- name: Force update for requests/urllib3 - become: true - yum: - name: "{{item}}" - state: latest - update_cache: true - enablerepo: asb,epel - disablerepo: centos-openstack-ocata - with_items: - - python-requests - - name: Install required packages become: true yum: name: "{{item}}" state: latest with_items: - - ansible - - python-netaddr - -- name: Install required packages from asb - become: true - yum: - name: "{{item}}" - state: latest - with_items: - - ansible-kubernetes-modules + - openstack-tempest