Merge "Update validation path with the share/ansible one"

This commit is contained in:
Zuul 2020-09-08 09:21:22 +00:00 committed by Gerrit Code Review
commit 20b0b65c6d
2 changed files with 4 additions and 4 deletions

View File

@ -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:

View File

@ -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