diff --git a/roles/validations/defaults/main.yaml b/roles/validations/defaults/main.yaml index d617ba74..ae641c86 100644 --- a/roles/validations/defaults/main.yaml +++ b/roles/validations/defaults/main.yaml @@ -1,7 +1,7 @@ log_dir: "{{ ansible_user_dir }}/logs" zuul_work_virtualenv: "{{ ansible_user_dir }}/.venv" -ansible_dir: "{{ zuul_work_virtualenv }}/share/validations-common" -validation_dir: "{{ zuul_work_virtualenv }}/share/validations-common/playbooks" +ansible_dir: "{{ zuul_work_virtualenv }}/share/ansible" +validation_dir: "{{ zuul_work_virtualenv }}/share/ansible/validation-playbooks" vf_log_dir: "/var/log/validations" val_exec: "source {{ zuul_work_virtualenv }}/bin/activate; validation.py" command: diff --git a/validations_libs/constants.py b/validations_libs/constants.py index 6c124f38..fc49fdb9 100644 --- a/validations_libs/constants.py +++ b/validations_libs/constants.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # 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