diff options
| -rw-r--r-- | resources/ansible_roles/ceph-info/tasks/network.yml | 4 | ||||
| -rw-r--r-- | resources/ansible_roles/qtip-generator/files/storage/run.yml | 2 | ||||
| -rw-r--r-- | tests/ci/compute/docker-compose.yaml | 3 | ||||
| -rwxr-xr-x | tests/ci/periodic.sh | 2 | ||||
| -rw-r--r-- | tests/ci/utils/start_services.sh | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/resources/ansible_roles/ceph-info/tasks/network.yml b/resources/ansible_roles/ceph-info/tasks/network.yml index d5319c55..4ec7b562 100644 --- a/resources/ansible_roles/ceph-info/tasks/network.yml +++ b/resources/ansible_roles/ceph-info/tasks/network.yml @@ -20,11 +20,11 @@ - fetch: src: /etc/ceph/ceph.conf - dest: "{{ qtip_results }}/sysinfo-{{ inventory_hostname }}/" + dest: "{{ output }}/" flat: yes - name: collect ceph system info from ceph.conf - set_fact: {"{{ item }}":"{{ lookup('ini', '{{ item }} section=global default='' file={{ qtip_results }}/sysinfo-{{ inventory_hostname }}/ceph.conf') }}"} + set_fact: {"{{ item }}":"{{ lookup('ini', '{{ item }} section=global default='' file={{ output }}/ceph.conf') }}"} with_items: - cluster_network delegate_to: localhost diff --git a/resources/ansible_roles/qtip-generator/files/storage/run.yml b/resources/ansible_roles/qtip-generator/files/storage/run.yml index 1ddf0b59..ee605f11 100644 --- a/resources/ansible_roles/qtip-generator/files/storage/run.yml +++ b/resources/ansible_roles/qtip-generator/files/storage/run.yml @@ -13,7 +13,7 @@ roles: - { role: qtip, tasks: setup-local, tags: [setup] } - - { role: storperf, output: "{% raw %}{{ qtip_results }}{% endraw %}/storperf" } + - { role: storperf, output: "{% raw %}{{ qtip_results }}{% endraw %}/current/storperf" } - hosts: SUT roles: diff --git a/tests/ci/compute/docker-compose.yaml b/tests/ci/compute/docker-compose.yaml index f21190e9..712c9c54 100644 --- a/tests/ci/compute/docker-compose.yaml +++ b/tests/ci/compute/docker-compose.yaml @@ -14,4 +14,5 @@ services: container_name: compute_qtip image: opnfv/qtip:${DOCKER_TAG} env_file: ${ENV_FILE} - volumes: ${SSH_CREDENTIALS}:/root/.ssh + volumes: + - ${SSH_CREDENTIALS}:/root/.ssh diff --git a/tests/ci/periodic.sh b/tests/ci/periodic.sh index a0054fec..5c488b87 100755 --- a/tests/ci/periodic.sh +++ b/tests/ci/periodic.sh @@ -13,7 +13,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source ${script_dir}/utils/start_services.sh -docker exec -t ${TEST_SUITE}_qtip bash -x ${qtip_repo}/qtip/scripts/quickstart.sh +docker exec -t ${TEST_SUITE}_qtip bash -x /home/opnfv/repos/qtip/qtip/scripts/quickstart.sh echo "${TEST_SUITE} QPI done!" diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh index 78bc2970..3c481be4 100644 --- a/tests/ci/utils/start_services.sh +++ b/tests/ci/utils/start_services.sh @@ -17,6 +17,8 @@ SCENARIO=${DEPLOY_SCENARIO:-generic} TESTAPI_URL=${TESTAPI_URL:-} EOF +export SSH_CREDENTIALS=${SSH_CREDENTIALS:-/root/.ssh} + TMPFILE=`mktemp /tmp/qtip.XXXXXX` || exit 1 curl https://git.opnfv.org/releng/plain/utils/fetch_os_creds.sh | bash -s -- \ -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} -d ${TMPFILE} |