3 files changed, 56 insertions, 29 deletions
diff --git a/tests/ci/ansible_clean_images.sh b/tests/ci/ansible_clean_images.sh
new file mode 100755
index 000000000..c35ec0f3c
--- /dev/null
+++ b/tests/ci/ansible_clean_images.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Copyright (c) 2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+OPENRC='/home/opnfv/openrc'
+source "${OPENRC}"
+CONTROLLER_IP=$(echo ${OS_AUTH_URL} | sed -ne "s/http:\/\/\(.*\):.*/\1/p")
+export no_proxy="localhost,${CONTROLLER_IP}"
+ANSIBLE_SCRIPTS="${0%/*}/../../ansible"
+
+cd ${ANSIBLE_SCRIPTS} &&\
+ansible-playbook \
+         -vvv -i inventory.ini clean_images.yml
diff --git a/tests/ci/ansible_load_images.sh b/tests/ci/ansible_load_images.sh
new file mode 100755
index 000000000..4f62024db
--- /dev/null
+++ b/tests/ci/ansible_load_images.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+# Copyright (c) 2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+OPENRC='/home/opnfv/openrc'
+source "${OPENRC}"
+CONTROLLER_IP=$(echo ${OS_AUTH_URL} | sed -ne "s/http:\/\/\(.*\):.*/\1/p")
+export no_proxy="localhost,${CONTROLLER_IP}"
+ANSIBLE_SCRIPTS="${0%/*}/../../ansible"
+
+cd ${ANSIBLE_SCRIPTS} &&\
+ansible-playbook \
+         -e img_modify_playbook='ubuntu_server_cloudimg_modify.yml' \
+         -e target_os='Ubuntu' \
+         -e YARD_IMG_ARCH='amd64' \
+         -e target_os_version='16.04' \
+         -e target_os_family='Debian' \
+         -e clone_dest='/usr/local/src' \
+         -e ubuntu_image='yardstick-trusty-server.raw' \
+         -e ubuntu_image_file='/tmp/workspace/yardstick/yardstick-trusty-server.raw' \
+         -vvv -i inventory.ini load_images.yml
diff --git a/tests/ci/apexlake-verify b/tests/ci/apexlake-verify
deleted file mode 100755
index 6a691063f..000000000
--- a/tests/ci/apexlake-verify
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-DPDK_HOST=10.118.36.130
-
-YARDSTICK=/home/user/yardstick
-TESTSUITE=$YARDSTICK/tests/opnfv/test_suites/opnfv_vTC_daily.yaml
-
-: ${INSTALLER_TYPE:='unknown'}
-: ${NODE_NAME:='unknown'}
-: ${DEPLOY_SCENARIO:='unknown'}
-
-commands="
-cd $YARDSTICK
-source /home/user/openrc.dasm
-export INSTALLER_TYPE=$INSTALLER_TYPE
-export NODE_NAME=$NODE_NAME
-export DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-sudo -E yardstick task start --suite $TESTSUITE"
-
-echo "$commands" | ssh -l user $DPDK_HOST 'bash -s'
-exit $?