openstack
/
openstack-ansible-tests
Code Issues Proposed changes

Fix clone list for opendev changes 

Disable CentOS gating to allow the galera_server percona-release fix
to merge[1].

openSUSE 42.3 gating is removed since it uses LXC containers and our
LXC build process is broken on 42.3, plus 42.3 is scheduled for EOL
soon.

[1] https://review.opendev.org/#/c/662107/

Change-Id: I82052e89d84beb31df41ee2cb8e89746ddf41150
This commit is contained in:
Logan V 2019-05-03 14:17:56 -06:00 committed by Antony Messerli
parent 8b37e468bb
commit 310d2450d1
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
get-ansible-role-requirements.yml
View File

@ -105,7 +105,7 @@
{%- for role in osa_roles %}
{%- if (role['name'] | match('os_previous_.*')) or
(role['name'] | match('previous_.*')) or
(role['src'] | regex_replace('https://git.openstack.org/', '') not in zuul_src_repo_list) %}
(role['src'] | regex_replace('https://(?:git.openstack.org|opendev.org)/', '') not in zuul_src_repo_list) %}
{%- set _ = filtered_role_list.append(role) %}
{%- endif %}
{%- endfor %}
@ -139,4 +139,4 @@
homedir: "{{ lookup('env', 'TESTING_HOME') }}"
role_file: "{{ lookup('env', 'ANSIBLE_ROLE_REQUIREMENTS_PATH') }}"
osa_roles: "{{ lookup('file', role_file) | from_yaml }}"
zuul_git_src_dir: "/home/zuul/src/git.openstack.org"
zuul_git_src_dir: "/home/zuul/src/opendev.org"

24
tests/ansible-role-requirements.yml
View File

@ -1,48 +1,48 @@
- name: apt_package_pinning
src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
scm: git
version: stable/pike
- name: pip_install
src: https://git.openstack.org/openstack/openstack-ansible-pip_install
src: https://opendev.org/openstack/openstack-ansible-pip_install
scm: git
version: stable/pike
- name: memcached_server
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
src: https://opendev.org/openstack/openstack-ansible-memcached_server
scm: git
version: stable/pike
- name: openstack_hosts
src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
scm: git
version: stable/pike
- name: lxc_hosts
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
scm: git
version: stable/pike
- name: lxc_container_create
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
scm: git
version: stable/pike
- name: galera_client
src: https://git.openstack.org/openstack/openstack-ansible-galera_client
src: https://opendev.org/openstack/openstack-ansible-galera_client
scm: git
version: stable/pike
- name: galera_server
src: https://git.openstack.org/openstack/openstack-ansible-galera_server
src: https://opendev.org/openstack/openstack-ansible-galera_server
scm: git
version: stable/pike
- name: rabbitmq_server
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
scm: git
version: stable/pike
- name: os_keystone
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
src: https://opendev.org/openstack/openstack-ansible-os_keystone
scm: git
version: stable/pike
- name: openstack_openrc
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
scm: git
version: stable/pike
- name: os_tempest
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
src: https://opendev.org/openstack/openstack-ansible-os_tempest
scm: git
version: stable/pike

8
tests/tests-repo-clone.sh
View File

@ -33,7 +33,7 @@ set -e
export TESTING_HOME=${TESTING_HOME:-$HOME}
export WORKING_DIR=${WORKING_DIR:-$(pwd)}
export CLONE_UPGRADE_TESTS=${CLONE_UPGRADE_TESTS:-no}
export ZUUL_TESTS_CLONE_LOCATION="/home/zuul/src/git.openstack.org/openstack/openstack-ansible-tests"
export ZUUL_TESTS_CLONE_LOCATION="/home/zuul/src/opendev.org/openstack/openstack-ansible-tests"
## Functions -----------------------------------------------------------------
@ -66,7 +66,7 @@ if [[ -x /usr/zuul-env/bin/zuul-cloner ]] && [[ "${ZUUL_REF:-none}" != "none" ]]
/usr/zuul-env/bin/zuul-cloner \
--cache-dir /opt/git \
--map ${TESTING_HOME}/tests-clonemap.yaml \
git://git.openstack.org \
https://opendev.org \
openstack/openstack-ansible-tests
# Clean up the clonemap.
@ -97,7 +97,7 @@ elif [[ ! -d tests/common ]]; then
# repo in some way, so just clone it from upstream.
else
git clone -b stable/pike \
https://git.openstack.org/openstack/openstack-ansible-tests \
https://opendev.org/openstack/openstack-ansible-tests \
${WORKING_DIR}/tests/common
fi
fi
@ -111,7 +111,7 @@ fi
if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then
if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then
git clone -b stable/ocata \
https://git.openstack.org/openstack/openstack-ansible-tests \
https://opendev.org/openstack/openstack-ansible-tests \
${WORKING_DIR}/tests/common/previous
fi
fi

7
zuul.d/project.yaml
View File

@ -20,14 +20,13 @@
check:
jobs:
- openstack-ansible-linters
- openstack-ansible-functional-centos-7
- openstack-ansible-functional-opensuse-423
- openstack-ansible-functional-centos-7:
voting: false
- openstack-ansible-functional-ubuntu-xenial
gate:
jobs:
- openstack-ansible-linters
- openstack-ansible-functional-centos-7
- openstack-ansible-functional-opensuse-423
# - openstack-ansible-functional-centos-7
- openstack-ansible-functional-ubuntu-xenial
post:
jobs: