From 237664a32c2212953733f0f808810543c440d123 Mon Sep 17 00:00:00 2001 From: mbeierl Date: Wed, 20 Sep 2017 19:45:45 -0400 Subject: Adding FUEL Support Changes to Ubuntu 17.04 to overcome issue in 4.4 kernel on ARM for hotplug of cinder volumes. Adds support for FUEL MCP certificate for SSL communication with OpenStack. Hard codes the target device to /dev/vdc for FUEL as /dev/vdb is reserved for the OpenStack config drive. Change-Id: I17dae23f455448f632e0921dbdae45824bbeaa61 Signed-off-by: mbeierl --- ci/daily.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ci/daily.sh') diff --git a/ci/daily.sh b/ci/daily.sh index 3278e4a..0957e09 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -36,9 +36,11 @@ pip install python-openstackclient==3.7.0 pip install python-heatclient==1.7.0 "${WORKSPACE}/ci/generate-admin-rc.sh" + echo "TEST_DB_URL=http://testresults.opnfv.org/test/api/v1" >> "${WORKSPACE}/ci/job/admin.rc" "${WORKSPACE}/ci/generate-environment.sh" + # shellcheck source=/dev/null source "${WORKSPACE}/ci/job/environment.rc" @@ -61,7 +63,6 @@ export VOLUME_SIZE=${VOLUME_SIZE:-2} export WORKLOADS=${WORKLOADS:-ws,rs,rw} ARCH="${ARCH:-$(uname -m)}" -IMAGE_NAME="Ubuntu 16.04 ${ARCH}" echo ========================================================================== echo Environment @@ -71,6 +72,7 @@ echo ========================================================================== "$WORKSPACE/ci/remove_docker_container.sh" "$WORKSPACE/ci/delete_stack.sh" "$WORKSPACE/ci/create_glance_image.sh" +IMAGE_NAME=$(cat $WORKSPACE/ci/job/glance_image_name) "$WORKSPACE/ci/create_storperf_flavor.sh" "$WORKSPACE/ci/launch_docker_container.sh" "$WORKSPACE/ci/create_stack.sh" "${AGENT_COUNT}" "${VOLUME_SIZE}" "${IMAGE_NAME}" "${NETWORK}" @@ -83,8 +85,6 @@ echo "========================================================================== echo "Starting run of ${WORKLOAD} ${BLOCK_SIZE} ${QUEUE_DEPTH}" echo "==========================================================================" -exit 0 - JOB=$("${WORKSPACE}/ci/start_job.sh" \ | awk '/job_id/ {print $2}' | sed 's/"//g') curl -s -X GET "http://127.0.0.1:5000/api/v1.0/jobs?id=${JOB}&type=status" \ -- cgit 1.2.3-korg