Browse Source

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

tags/1.0.4^0
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
20b0b65c6d
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      roles/validations/defaults/main.yaml
  2. +2
    -2
      validations_libs/constants.py

+ 2
- 2
roles/validations/defaults/main.yaml 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:


+ 2
- 2
validations_libs/constants.py 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



Loading…
Cancel
Save