Fixing ci
* adding task names to satisfy lint * fixing requirements for test setup Change-Id: Ic7f019c5f58b456cb36c62283bf72a195d82c299
This commit is contained in:
parent
41c93a403d
commit
eb5000e100
|
@ -0,0 +1,9 @@
|
||||||
|
ansible
|
||||||
|
ansi2html
|
||||||
|
docker
|
||||||
|
pytest
|
||||||
|
pytest-cov
|
||||||
|
pytest-html
|
||||||
|
pytest-xdist
|
||||||
|
mock
|
||||||
|
molecule>=3.0,<3.1
|
|
@ -19,7 +19,8 @@
|
||||||
become: true
|
become: true
|
||||||
hosts: all
|
hosts: all
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- name: Test ansible-role-container-registry
|
||||||
|
include_role:
|
||||||
name: ansible-role-container-registry
|
name: ansible-role-container-registry
|
||||||
vars:
|
vars:
|
||||||
container_registry_deploy_docker: true
|
container_registry_deploy_docker: true
|
||||||
|
|
|
@ -27,7 +27,8 @@
|
||||||
|
|
||||||
- name: ensure role fails when credentials missing
|
- name: ensure role fails when credentials missing
|
||||||
block:
|
block:
|
||||||
- include_role:
|
- name: ensure role fails when credentials missing
|
||||||
|
include_role:
|
||||||
name: ansible-role-container-registry
|
name: ansible-role-container-registry
|
||||||
tasks_from: registry-login
|
tasks_from: registry-login
|
||||||
vars:
|
vars:
|
||||||
|
@ -130,7 +131,8 @@
|
||||||
localhost:5000:
|
localhost:5000:
|
||||||
testuser: testpassword
|
testuser: testpassword
|
||||||
tasks:
|
tasks:
|
||||||
- include_role:
|
- name: include container registry role
|
||||||
|
include_role:
|
||||||
name: ansible-role-container-registry
|
name: ansible-role-container-registry
|
||||||
tasks_from: registry-login
|
tasks_from: registry-login
|
||||||
|
|
||||||
|
@ -149,7 +151,8 @@
|
||||||
success_msg: Credential file correctly present
|
success_msg: Credential file correctly present
|
||||||
failed_when: false
|
failed_when: false
|
||||||
rescue:
|
rescue:
|
||||||
- debug:
|
- name: rescue
|
||||||
|
debug:
|
||||||
msg: noop
|
msg: noop
|
||||||
|
|
||||||
- name: Verify credentials can be used
|
- name: Verify credentials can be used
|
||||||
|
|
|
@ -33,7 +33,8 @@
|
||||||
when:
|
when:
|
||||||
- ansible_user_dir is undefined
|
- ansible_user_dir is undefined
|
||||||
|
|
||||||
- include_role:
|
- name: include container registry role
|
||||||
|
include_role:
|
||||||
name: ansible-role-container-registry
|
name: ansible-role-container-registry
|
||||||
tasks_from: docker
|
tasks_from: docker
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,8 @@
|
||||||
- container_registry_docker_install is defined
|
- container_registry_docker_install is defined
|
||||||
- container_registry_docker_install is changed
|
- container_registry_docker_install is changed
|
||||||
rescue:
|
rescue:
|
||||||
- debug:
|
- name: Failed removing docker
|
||||||
|
debug:
|
||||||
msg: "unable to remove docker"
|
msg: "unable to remove docker"
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,8 @@
|
||||||
loop: "{{ query('dict', container_registry_logins | default({})) }}"
|
loop: "{{ query('dict', container_registry_logins | default({})) }}"
|
||||||
register: registry_login_docker
|
register: registry_login_docker
|
||||||
rescue:
|
rescue:
|
||||||
- debug:
|
- name: Failed login
|
||||||
|
debug:
|
||||||
msg: "Warning: login failed for some credentials while using docker login"
|
msg: "Warning: login failed for some credentials while using docker login"
|
||||||
|
|
||||||
- import_tasks: cleanup-engine.yml
|
- import_tasks: cleanup-engine.yml
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
- pytest-xdist
|
- pytest-xdist
|
||||||
- mock
|
- mock
|
||||||
- molecule>=3.0.1
|
- molecule>=3.0.1
|
||||||
|
- pbr
|
||||||
tasks:
|
tasks:
|
||||||
- name: set basic user fact
|
- name: set basic user fact
|
||||||
fail:
|
fail:
|
||||||
|
@ -30,6 +30,10 @@
|
||||||
when:
|
when:
|
||||||
- ansible_user_dir is undefined
|
- ansible_user_dir is undefined
|
||||||
|
|
||||||
|
- name: Set project path fact
|
||||||
|
set_fact:
|
||||||
|
container_registry_project_path: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/ansible-role-container-registry'].src_dir }}"
|
||||||
|
|
||||||
- name: Ensure the user has a .ssh directory
|
- name: Ensure the user has a .ssh directory
|
||||||
file:
|
file:
|
||||||
path: "{{ ansible_user_dir }}/.ssh"
|
path: "{{ ansible_user_dir }}/.ssh"
|
||||||
|
@ -95,3 +99,6 @@
|
||||||
name: "{{ molecule_requirements }}"
|
name: "{{ molecule_requirements }}"
|
||||||
virtualenv: "{{ ansible_user_dir }}/test-python"
|
virtualenv: "{{ ansible_user_dir }}/test-python"
|
||||||
virtualenv_site_packages: true
|
virtualenv_site_packages: true
|
||||||
|
extra_args: >-
|
||||||
|
--requirement "{{ container_registry_project_path }}/molecule-requirements.txt"
|
||||||
|
--constraint "{{ container_registry_project_path }}/ansible-requirements.txt"
|
||||||
|
|
Loading…
Reference in New Issue