aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile2
-rwxr-xr-xdocker/common.sh46
-rwxr-xr-xdocker/prepare_env.sh135
-rwxr-xr-xdocker/run_tests.sh9
-rw-r--r--testcases/config_functest.yaml19
5 files changed, 4 insertions, 207 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 71032a45..876033d4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -67,7 +67,7 @@ RUN git config --global http.sslVerify false
RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest
RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng
RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor
-RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally
+RUN git clone -b 0.3.3 clone https://github.com/openstack/rally.git ${repos_dir}/rally
RUN git clone https://github.com/openstack/tempest.git ${repos_dir}/tempest
RUN git clone https://github.com/opendaylight/integration.git ${repos_dir}/odl_integration
RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-test
diff --git a/docker/common.sh b/docker/common.sh
index 0d2cfb9b..ccb653f8 100755
--- a/docker/common.sh
+++ b/docker/common.sh
@@ -61,52 +61,6 @@ FUNCTEST_CONF_DIR=$(cat $config_file | grep -w dir_functest_conf | awk 'END {pri
FUNCTEST_DATA_DIR=$(cat $config_file | grep -w dir_functest_data | awk 'END {print $NF}')
RALLY_VENV_DIR=$(cat $config_file | grep -w dir_rally_inst | awk 'END {print $NF}')
-# Repos
-RALLY_BRANCH=$(cat $config_file | grep -w rally_branch | awk 'END {print $NF}')
-RALLY_COMMIT=$(cat $config_file | grep -w rally_commit | awk 'END {print $NF}')
-RELENG_BRANCH=$(cat $config_file | grep -w releng_branch | awk 'END {print $NF}')
-RELENG_COMMIT=$(cat $config_file | grep -w releng_commit | awk 'END {print $NF}')
-VIMS_BRANCH=$(cat $config_file | grep -w vims_test_branch | awk 'END {print $NF}')
-VIMS_COMMIT=$(cat $config_file | grep -w vims_test_commit | awk 'END {print $NF}')
-BGPVPN_BRANCH=$(cat $config_file | grep -w bgpvpn_branch | awk 'END {print $NF}')
-BGPVPN_COMMIT=$(cat $config_file | grep -w bgpvpn_commit | awk 'END {print $NF}')
-ONOS_BRANCH=$(cat $config_file | grep -w onos_branch | awk 'END {print $NF}')
-ONOS_COMMIT=$(cat $config_file | grep -w onos_commit | awk 'END {print $NF}')
-PROMISE_BRANCH=$(cat $config_file | grep -w promise_branch | awk 'END {print $NF}')
-PROMISE_COMMIT=$(cat $config_file | grep -w promise_commit | awk 'END {print $NF}')
-OVNO_BRANCH=$(cat $config_file | grep -w ovno_branch | awk 'END {print $NF}')
-OVNO_COMMIT=$(cat $config_file | grep -w ovno_commit | awk 'END {print $NF}')
-DOCTOR_BRANCH=$(cat $config_file | grep -w doctor_branch | awk 'END {print $NF}')
-DOCTOR_COMMIT=$(cat $config_file | grep -w doctor_commit | awk 'END {print $NF}')
-
-echo "_____Parsed needed data from ${config_file}:"
-echo "####### Directories #######"
-echo "REPOS_DIR=${REPOS_DIR}"
-echo "FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR}"
-echo "RALLY_REPO_DIR=${RALLY_REPO_DIR}"
-echo "RELENG_REPO_DIR=${RELENG_REPO_DIR}"
-echo "VIMS_REPO_DIR=${VIMS_REPO_DIR}"
-echo "FUNCTEST_DIR=${FUNCTEST_DIR}"
-echo "FUNCTEST_RESULTS_DIR=${FUNCTEST_RESULTS_DIR}"
-echo "FUNCTEST_CONF_DIR=${FUNCTEST_CONF_DIR}"
-echo "FUNCTEST_DATA_DIR=${FUNCTEST_DATA_DIR}"
-echo "RALLY_VENV_DIR=${RALLY_VENV_DIR}"
-echo "####### Repositories #######"
-echo "RELENG_BRANCH=${RELENG_BRANCH}"
-echo "RELENG_COMMIT=${RELENG_COMMIT}"
-echo "RALLY_BRANCH=${RALLY_BRANCH}"
-echo "RALLY_COMMIT=${RALLY_COMMIT}"
-echo "VIMS_BRANCH=${VIMS_BRANCH}"
-echo "VIMS_COMMIT=${VIMS_COMMIT}"
-echo "ONOS_BRANCH=${ONOS_BRANCH}"
-echo "ONOS_COMMIT=${ONOS_COMMIT}"
-echo "PROMISE_BRANCH=${PROMISE_BRANCH}"
-echo "PROMISE_COMMIT=${PROMISE_COMMIT}"
-echo "OVNO_BRANCH=${OVNO_BRANCH}"
-echo "OVNO_COMMIT=${OVNO_COMMIT}"
-echo "DOCTOR_BRANCH=${DOCTOR_BRANCH}"
-echo "DOCTOR_COMMIT=${DOCTOR_COMMIT}"
-echo "############################"
info () {
logger -s -t "FUNCTEST.info" "$*"
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 58fa514e..c9bc9920 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -16,17 +16,14 @@
usage="Script to prepare the Functest environment.
usage:
- bash $(basename "$0") [--offline] [-h|--help] [-t <test_name>]
+ bash $(basename "$0") [-h|--help] [-t <test_name>]
where:
- -o|--offline optional offline mode (experimental)
-h|--help show this help text
examples:
$(basename "$0")
- $(basename "$0") --offline"
-offline=false
# Parse parameters
while [[ $# > 0 ]]
@@ -38,9 +35,6 @@ while [[ $# > 0 ]]
exit 0
shift
;;
- -o|--offline)
- offline=true
- ;;
*)
error "unknown option $1"
exit 1
@@ -52,15 +46,8 @@ done
BASEDIR=`dirname $0`
source ${BASEDIR}/common.sh
-# Support for Functest offline
-# NOTE: Still not 100% working when running the tests
info "######### Preparing Functest environment #########"
-if [ $offline == false ]; then
- info "MODE: online"
-else
- info "MODE: offline"
-fi
# definition of available installer names
INSTALLERS=(fuel compass apex joid)
@@ -84,131 +71,12 @@ if [ ! -f ${FUNCTEST_CONF_DIR}/openstack.creds ]; then
fi
-if [ $offline == false ]; then
- # Update repos
- info "Updating Releng repository...."
- cd ${RELENG_REPO_DIR}
- if [ ${RELENG_BRANCH} != "master" ]; then
- info "Releng repo: checkout ${RELENG_BRANCH} branch..."
- git checkout ${RELENG_BRANCH}
- fi
- info "Releng repo: pulling to latest..."
- git pull
- if [ ${RELENG_COMMIT} != "latest" ]; then
- info "Releng repo: given commit is ${RELENG_COMMIT}. Reseting..."
- git reset --hard ${RELENG_COMMIT}
- fi
-
- info "Updating Rally repository...."
- cd ${RALLY_REPO_DIR}
- if [ ${RALLY_BRANCH} != "master" ]; then
- info "Rally repo: checkout ${RALLY_BRANCH} branch..."
- git checkout ${RALLY_BRANCH}
- fi
- info "Rally repo: pulling to latest..."
- git pull
- # We leave the reset command for later.
-
- info "Updating vIMS test repository...."
- cd ${VIMS_REPO_DIR}
- if [ ${VIMS_BRANCH} != "stable" ]; then
- info "Releng repo: checkout ${VIMS_TEST_BRANCH} branch..."
- git checkout ${VIMS_BRANCH}
- fi
- info "vIMS test repo: pulling to latest..."
- git pull
- if [ ${VIMS_COMMIT} != "latest" ]; then
- info "vIMS test repo: given commit is ${VIMS_TEST_COMMIT}. Reseting..."
- git reset --hard ${VIMS_COMMIT}
- fi
-
- info "Updating BGPVPN repository...."
- cd ${BGPVPN_REPO_DIR}
- if [ ${BGPVPN_BRANCH} != "master" ]; then
- info "BGPVPN repo: checkout ${BGPVPN_BRANCH} branch..."
- git checkout ${BGPVPN_BRANCH}
- fi
- info "BGPVPN repo: pulling to latest..."
- git pull
- if [ ${BGPVPN_COMMIT} != "latest" ]; then
- info "BGPVPN repo: given commit is ${BGPVPN_COMMIT}. Reseting..."
- git reset --hard ${BGPVPN_COMMIT}
- fi
-
- info "Updating ONOS repository...."
- cd ${ONOS_REPO_DIR}
- if [ ${ONOS_BRANCH} != "master" ]; then
- info "ONOS repo: checkout ${ONOS} branch..."
- git checkout ${ONOS_BRANCH}
- fi
- info "ONOS repo: pulling to latest..."
- git pull
- if [ ${ONOS_COMMIT} != "latest" ]; then
- info "ONOS repo: given commit is ${ONOS_COMMIT}. Reseting..."
- git reset --hard ${ONOS_COMMIT}
- fi
-
- info "Updating PROMISE repository...."
- cd ${PROMISE_REPO_DIR}
- if [ ${PROMISE_BRANCH} != "master" ]; then
- info "PROMISE repo: checkout ${PROMISE} branch..."
- git checkout ${PROMISE_BRANCH}
- fi
- info "PROMISE repo: pulling to latest..."
- git pull
- if [ ${PROMISE_COMMIT} != "latest" ]; then
- info "PROMISE repo: given commit is ${PROMISE_COMMIT}. Reseting..."
- git reset --hard ${PROMISE_COMMIT}
- fi
-
- info "Updating OVNO repository...."
- cd ${OVNO_REPO_DIR}
- if [ ${OVNO_BRANCH} != "master" ]; then
- info "OVNO repo: checkout ${OVNO} branch..."
- git checkout ${OVNO_BRANCH}
- fi
- info "OVNO repo: pulling to latest..."
- git pull
- if [ ${OVNO_COMMIT} != "latest" ]; then
- info "OVNO repo: given commit is ${OVNO_COMMIT}. Reseting..."
- git reset --hard ${OVNO_COMMIT}
- fi
-
- info "Updating DOCTOR repository...."
- cd ${DOCTOR_REPO_DIR}
- if [ ${DOCTOR_BRANCH} != "master" ]; then
- info "DOCTOR repo: checkout ${DOCTOR} branch..."
- git checkout ${DOCTOR_BRANCH}
- fi
- info "DOCTOR repo: pulling to latest..."
- git pull
- if [ ${DOCTOR_COMMIT} != "latest" ]; then
- info "DOCTOR repo: given commit is ${DOCTOR_COMMIT}. Reseting..."
- git reset --hard ${DOCTOR_COMMIT}
- fi
-fi
-
-# We do this regardless if its online or offline mode.
-# Assumption: the docker image contains a newer rally repo than the given commit.
-if [ ${RALLY_COMMIT} != "latest" ]; then
- cd ${RALLY_REPO_DIR}
- info "Rally repo: given commit is ${RALLY_COMMIT}. Reseting..."
- git reset --hard ${RALLY_COMMIT}
-fi
-
-# IMPORTANT: To be removed when version 0.2.1 is out
-git config --global user.email "functest@opnfv.com"
-git config --global user.name "opnfv/functest"
-git fetch https://review.openstack.org/openstack/rally refs/changes/06/270506/9 && git cherry-pick FETCH_HEAD
-
-
# Create directories
mkdir -p ${FUNCTEST_CONF_DIR}
mkdir -p ${FUNCTEST_DATA_DIR}
mkdir -p ${FUNCTEST_RESULTS_DIR}/ODL
-
# Create Openstack credentials file
# $creds is an env varialbe in the docker container pointing to
# /home/opnfv/functest/conf/openstack.creds
@@ -255,7 +123,6 @@ fi
info "Generating OpenStack defaults..."
python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py -d
-
ifconfig eth0 mtu 1450
echo "1" > ${FUNCTEST_CONF_DIR}/env_active
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 682450ee..05c78a29 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -25,7 +25,8 @@ where:
-s|--serial run tests in one thread
-t|--test run specific set of tests
<test_name> one or more of the following separated by comma:
- vping_ssh,vping_userdata,odl,onos,tempest,rally,vims,promise,doctor
+ healthcheck,vping_ssh,vping_userdata,odl,onos,
+ tempest,rally,vims,promise,doctor
examples:
@@ -34,9 +35,6 @@ examples:
$(basename "$0") -t tempest,rally"
-# Support for Functest offline
-# NOTE: Still not 100% working when running the tests
-offline=false
report=""
clean=true
serial=false
@@ -205,9 +203,6 @@ while [[ $# > 0 ]]
exit 0
shift
;;
- -o|--offline)
- offline=true
- ;;
-r|--report)
report="-r"
;;
diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 5b951388..5059a091 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -28,25 +28,6 @@ general:
dir_vIMS_data: /home/opnfv/functest/data/vIMS
dir_rally_inst: /home/opnfv/.rally
- repositories:
- # branch and commit ID to which the repos will be reset (HEAD)
- releng_branch: master
- releng_commit: latest
- rally_branch: master
- rally_commit: 1b6e9e9219b143c685a2af134ab025dddd72ed27
- vims_test_branch: stable
- vims_test_commit: latest
- bgpvpn_branch: master
- bgpvpn_commit: latest
- onos_branch: master
- onos_commit: latest
- promise_branch: master
- promise_commit: latest
- ovno_branch: master
- ovno_commit: latest
- doctor_branch: stable/brahmaputra
- doctor_commit: latest
-
openstack:
image_name: functest-img
image_file_name: cirros-0.3.4-x86_64-disk.img