From 70c27f24d07411103fb63090d17390f5ea249ebc Mon Sep 17 00:00:00 2001
From: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
Date: Mon, 7 Dec 2015 18:51:22 +0100
Subject: Docker image cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - Renamed docker image 'opnfv/yardstick-ci' -> 'opnfv/yardstick'
   as recommended by project.
 - Added cirros image and releng repo to docker image in order to
   make it more usable in offline mode.
 - Renamed run_benchmarks to run_tests.sh
 - Moved some environment setups to a new file prepare_env.sh
 - Added daily test suites file for ericsson and LF pods.

Docker image is now built and pushed by releng script:
https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=blob;f=jjb/opnfv/opnfv-docker.sh

The ci/docker/Makefile file is not used by releng to build yardstick
image but the makefile can still be used to build and test docker
images locally.

Change-Id: If9d6740b39e91d145c587d8d5e2bd372d09a46a9
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
---
 ci/docker/yardstick-ci/run_benchmarks | 79 -----------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100755 ci/docker/yardstick-ci/run_benchmarks

(limited to 'ci/docker/yardstick-ci/run_benchmarks')

diff --git a/ci/docker/yardstick-ci/run_benchmarks b/ci/docker/yardstick-ci/run_benchmarks
deleted file mode 100755
index 501b661be..000000000
--- a/ci/docker/yardstick-ci/run_benchmarks
+++ /dev/null
@@ -1,79 +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
-##############################################################################
-
-set -e
-
-: ${YARDSTICK_REPO:='https://gerrit.opnfv.org/gerrit/yardstick'}
-: ${YARDSTICK_REPO_DIR:='/home/opnfv/yardstick'}
-: ${YARDSTICK_BRANCH:='master'} # branch, tag, sha1 or refspec
-
-: ${RELENG_REPO:='https://gerrit.opnfv.org/gerrit/releng'}
-: ${RELENG_REPO_DIR:='/home/opnfv/repos/releng'}
-: ${RELENG_BRANCH:='master'} # branch, tag, sha1 or refspec
-
-: ${INSTALLER_TYPE:='fuel'}
-: ${INSTALLER_IP:='10.20.0.2'}
-
-: ${POD_NAME:='opnfv-jump-2'}
-: ${EXTERNAL_NET:='net04_ext'}
-
-git_checkout()
-{
-    if git cat-file -e $1^{commit} 2>/dev/null; then
-        # branch, tag or sha1 object
-        git checkout $1
-    else
-        # refspec / changeset
-        git fetch --tags --progress $2 $1
-        git checkout FETCH_HEAD
-    fi
-}
-
-echo
-echo "INFO: Updating releng -> $RELENG_BRANCH"
-if [ ! -d $RELENG_REPO_DIR ]; then
-    git clone $RELENG_REPO $RELENG_REPO_DIR
-fi
-cd $RELENG_REPO_DIR
-git checkout master && git pull
-git_checkout $RELENG_BRANCH $RELENG_REPO
-
-echo
-echo "INFO: Updating yardstick -> $YARDSTICK_BRANCH"
-if [ ! -d $YARDSTICK_REPO_DIR ]; then
-    git clone YARDSTICK_REPO $YARDSTICK_REPO_DIR
-fi
-cd $YARDSTICK_REPO_DIR
-git checkout master && git pull
-git_checkout $YARDSTICK_BRANCH $YARDSTICK_REPO
-
-echo
-echo "INFO: Creating openstack credentials .."
-
-# Create openstack credentials
-$RELENG_REPO_DIR/utils/fetch_os_creds.sh \
-    -d /tmp/openrc \
-    -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}
-
-source /tmp/openrc
-
-# FIXME: Temporary OPNFV playground hack
-if [ "$INSTALLER_TYPE" == "fuel" ]; then
-    ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-    if sshpass -p r00tme ssh 2>/dev/null $ssh_opts root@${INSTALLER_IP} \
-        fuel environment --env 1 | grep opnfv-virt; then
-        echo "INFO: applying OPNFV playground hack"
-        export OS_ENDPOINT_TYPE='publicURL'
-    fi
-fi
-
-export EXTERNAL_NET INSTALLER_TYPE POD_NAME
-
-$YARDSTICK_REPO_DIR/ci/yardstick-verify $@
-- 
cgit 1.2.3-korg