Update validation path with the share/ansible one

Depends-On: https://review.opendev.org/#/c/747761/
Change-Id: Ib612436e6c934fecee58137ed660a43dc5656ced
This commit is contained in:
Mathieu Bultel 2020-08-24 18:15:04 +02:00
parent 15e74046c1
commit f22d380319
2 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
log_dir: "{{ ansible_user_dir }}/logs" log_dir: "{{ ansible_user_dir }}/logs"
zuul_work_virtualenv: "{{ ansible_user_dir }}/.venv" zuul_work_virtualenv: "{{ ansible_user_dir }}/.venv"
ansible_dir: "{{ zuul_work_virtualenv }}/share/validations-common" ansible_dir: "{{ zuul_work_virtualenv }}/share/ansible"
validation_dir: "{{ zuul_work_virtualenv }}/share/validations-common/playbooks" validation_dir: "{{ zuul_work_virtualenv }}/share/ansible/validation-playbooks"
vf_log_dir: "/var/log/validations" vf_log_dir: "/var/log/validations"
val_exec: "source {{ zuul_work_virtualenv }}/bin/activate; validation.py" val_exec: "source {{ zuul_work_virtualenv }}/bin/activate; validation.py"
command: command:

View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
DEFAULT_VALIDATIONS_BASEDIR = '/usr/share/validations-common' DEFAULT_VALIDATIONS_BASEDIR = '/usr/share/ansible/'
ANSIBLE_VALIDATION_DIR = '/usr/share/validations-common/playbooks' ANSIBLE_VALIDATION_DIR = '/usr/share/ansible/validation-playbooks'
VALIDATION_GROUPS_INFO = '%s/groups.yaml' % DEFAULT_VALIDATIONS_BASEDIR VALIDATION_GROUPS_INFO = '%s/groups.yaml' % DEFAULT_VALIDATIONS_BASEDIR