Merge "Relocate api_root_dir outside of /tmp for integration tests"

ansible-community · Jun 21, 2019 · 68f51ae · 68f51ae
2 parents f741296 + 81509ee
commit 68f51ae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.zuul.d/role-jobs.yaml b/.zuul.d/role-jobs.yaml
@@ -20,7 +20,7 @@
       ara_api_version: HEAD
       ara_api_log_level: DEBUG
       ara_api_debug: true
-      ara_api_root_dir: /tmp/ara-integration-tests/.ara
+      ara_api_root_dir: "{{ ansible_user_dir }}/.ara-tests"
       ara_tests_ansible_name: "{{ ansible_user_dir }}/src/github.com/ansible/ansible"
       ara_tests_ansible_version: null
     required-projects:

diff --git a/tests/basic.yaml b/tests/basic.yaml
@@ -21,8 +21,7 @@
   vars:
     _ansible_name: ansible
     _ansible_version: latest
-    ara_api_root_dir: /tmp/ara-integration-tests/.ara
-    ara_api_venv_path: /tmp/ara-integration-tests/venv
+    ara_api_root_dir: "{{ ansible_user_dir }}/.ara-tests"
     ara_api_secret_key: testing
     ara_api_debug: true
     ara_api_log_level: DEBUG

diff --git a/tests/with_mysql.yaml b/tests/with_mysql.yaml
@@ -22,7 +22,7 @@
     _mysql_container_name: "ara_tests_mariadb"
     _mysql_image_name: "mariadb:10"
     ara_tests_cleanup: true
-    ara_api_root_dir: /tmp/ara-integration-tests/.ara
+    ara_api_root_dir: "{{ ansible_user_dir }}/.ara-tests"
     ara_api_secret_key: testing
     ara_api_debug: true
     ara_api_log_level: DEBUG

diff --git a/tests/with_postgresql.yaml b/tests/with_postgresql.yaml
@@ -20,7 +20,7 @@
   gather_facts: yes
   vars:
     ara_tests_cleanup: true
-    ara_api_root_dir: /tmp/ara-integration-tests/.ara
+    ara_api_root_dir: "{{ ansible_user_dir }}/.ara-tests"
     ara_api_secret_key: testing
     ara_api_debug: true
     ara_api_log_level: DEBUG