Update packages from requirements.txt with 'system_tests.sh -N'
Default behaviour of the system_tests.sh is unchanged,
but with -N it will update requirements on each run (without
--upgrade).
If fuel-devops has incorrect version or not installed, then
script will fail with -N option (until fuel-devops is not packed
to PyPi repository).
- Removed dependency on fuel-devops located on github.
This dependency splitted into two requirements:
requirements-devops.txt : will be used with -N option to
controll the installed fuel-devops version;
requirements-devops-source.txt : will be used for tox tests
and update python virtual environments on CI.
- Update system_tests.sh with two new options: -R and -N:
REQUIREMENTS_DIR or -R : name of the dir where requirements.txt
and constraints.txt are located (fuelweb_test by default)
UPDATE_REQUIREMENTS or -N : 'yes' or 'no' (-N == 'yes').
Perform update PyPi packages from requirements.txt.
Default : 'no'
- remove unused variables and code that was used for build ISO
Change-Id: Ib9efd2136226fb43b506db390079f1b72a06069d
Related-Bug:#1575065
(cherry picked from commit 5a62e85
)
This commit is contained in:
parent
551f59c4ba
commit
b4b24442c2
|
@ -0,0 +1,4 @@
|
||||||
|
# TODO(ddmitriev): remove this requirement when fuel-devops
|
||||||
|
# will be available as a PyPi package.
|
||||||
|
# Check virtual environment update scripts on CI first.
|
||||||
|
git+git://github.com/openstack/fuel-devops.git@2.9.20
|
|
@ -0,0 +1,3 @@
|
||||||
|
# TODO(ddmitriev): move this requirement to requirements.txt
|
||||||
|
# when fuel-devops will be available as a PyPi package
|
||||||
|
fuel-devops>=2.9.20
|
|
@ -1,7 +1,6 @@
|
||||||
nose==1.2.1
|
nose==1.2.1
|
||||||
git+git://github.com/openstack/fuel-devops.git@2.9.19
|
anyjson>=0.3.3 # BSD
|
||||||
anyjson==0.3.1
|
paramiko>=1.16.0 # LGPL
|
||||||
paramiko
|
|
||||||
proboscis==1.2.6.0
|
proboscis==1.2.6.0
|
||||||
ipaddr
|
ipaddr
|
||||||
junitxml>=0.7.0
|
junitxml>=0.7.0
|
||||||
|
|
8
tox.ini
8
tox.ini
|
@ -6,11 +6,17 @@
|
||||||
[tox]
|
[tox]
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
envlist = pep8
|
envlist = pep8
|
||||||
|
skip_missing_interpreters = True
|
||||||
|
|
||||||
|
[testenv]
|
||||||
|
deps =
|
||||||
|
-r{toxinidir}/fuelweb_test/requirements-devops-source.txt
|
||||||
|
-r{toxinidir}/fuelweb_test/requirements.txt
|
||||||
|
usedevelop = False
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
# TODO: #deps = hacking==0.7
|
# TODO: #deps = hacking==0.7
|
||||||
deps = flake8
|
deps = flake8
|
||||||
pep8<=1.5.7
|
|
||||||
usedevelop = False
|
usedevelop = False
|
||||||
commands =
|
commands =
|
||||||
flake8 {posargs:.}
|
flake8 {posargs:.}
|
||||||
|
|
|
@ -40,20 +40,14 @@ if you do need to override them.
|
||||||
-V (dir) - Path to python virtual environment
|
-V (dir) - Path to python virtual environment
|
||||||
-i (file) - Full path to ISO file to build or use for tests.
|
-i (file) - Full path to ISO file to build or use for tests.
|
||||||
Made from iso dir and name if not set.
|
Made from iso dir and name if not set.
|
||||||
-t (name) - Name of task this script should perform. Should be one of defined ones.
|
|
||||||
Taken from Jenkins' job's suffix if not set.
|
|
||||||
-o (str) - Allows you any extra command line option to run test job if you
|
-o (str) - Allows you any extra command line option to run test job if you
|
||||||
want to use some parameters.
|
want to use some parameters.
|
||||||
-a (str) - Allows you to path NOSE_ATTR to the test job if you want
|
-a (str) - Allows you to path NOSE_ATTR to the test job if you want
|
||||||
to use some parameters.
|
to use some parameters.
|
||||||
-A (str) - Allows you to path NOSE_EVAL_ATTR if you want to enter attributes
|
-A (str) - Allows you to path NOSE_EVAL_ATTR if you want to enter attributes
|
||||||
as python expressions.
|
as python expressions.
|
||||||
-m (name) - Use this mirror to build ISO from.
|
|
||||||
Uses 'srt' if not set.
|
|
||||||
-U - ISO URL for tests.
|
-U - ISO URL for tests.
|
||||||
Null by default.
|
Null by default.
|
||||||
-r (yes/no) - Should built ISO file be places with build number tag and
|
|
||||||
symlinked to the last build or just copied over the last file.
|
|
||||||
-b (num) - Allows you to override Jenkins' build number if you need to.
|
-b (num) - Allows you to override Jenkins' build number if you need to.
|
||||||
-l (dir) - Path to logs directory. Can be set by LOGS_DIR environment variable.
|
-l (dir) - Path to logs directory. Can be set by LOGS_DIR environment variable.
|
||||||
Uses WORKSPACE/logs if not set.
|
Uses WORKSPACE/logs if not set.
|
||||||
|
@ -63,6 +57,9 @@ if you do need to override them.
|
||||||
Useful for debugging.
|
Useful for debugging.
|
||||||
-k - Keep previously created test environment before tests run
|
-k - Keep previously created test environment before tests run
|
||||||
-K - Keep test environment after tests are finished
|
-K - Keep test environment after tests are finished
|
||||||
|
-R (name) - Name of the package where requirements.txt is located. For use with the option -N only.
|
||||||
|
Uses 'fuelweb_test' if option is not set.
|
||||||
|
-N - Install PyPi packages from 'requirements.txt'.
|
||||||
-h - Show this help page
|
-h - Show this help page
|
||||||
|
|
||||||
Most variables uses guessing from Jenkins' job name but can be overridden
|
Most variables uses guessing from Jenkins' job name but can be overridden
|
||||||
|
@ -115,29 +112,23 @@ GlobalVariables() {
|
||||||
ISO_PATH="${ISO_DIR}/${ISO_NAME}"
|
ISO_PATH="${ISO_DIR}/${ISO_NAME}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# what task should be ran
|
|
||||||
# it's taken from jenkins job name suffix if not set by options
|
|
||||||
if [ -z "${TASK_NAME}" ]; then
|
|
||||||
TASK_NAME="${JOB_NAME##*.}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# do we want to keep iso's for each build or just copy over single file
|
|
||||||
ROTATE_ISO="${ROTATE_ISO:=yes}"
|
|
||||||
|
|
||||||
# choose mirror to build iso from. Default is 'srt' for Saratov's mirror
|
|
||||||
# you can change mirror by exporting USE_MIRROR variable before running this script
|
|
||||||
USE_MIRROR="${USE_MIRROR:=srt}"
|
|
||||||
|
|
||||||
# only show what commands would be executed but do nothing
|
# only show what commands would be executed but do nothing
|
||||||
# this feature is useful if you want to debug this script's behaviour
|
# this feature is useful if you want to debug this script's behaviour
|
||||||
DRY_RUN="${DRY_RUN:=no}"
|
DRY_RUN="${DRY_RUN:=no}"
|
||||||
|
|
||||||
VENV="${VENV:=yes}"
|
VENV="${VENV:=yes}"
|
||||||
|
|
||||||
|
# Path to the directory where requirements.txt is placed.
|
||||||
|
# Default place is ./fuelweb_test/requirements.txt
|
||||||
|
REQUIREMENTS_DIR="${REQUIREMENTS_DIR:=fuelweb_test}"
|
||||||
|
|
||||||
|
# Perform requirements update from the requirements.txt file. Default = no.
|
||||||
|
UPDATE_REQUIREMENTS="${UPDATE_REQUIREMENTS:=no}"
|
||||||
}
|
}
|
||||||
|
|
||||||
GetoptsVariables() {
|
GetoptsVariables() {
|
||||||
while getopts ":w:j:i:t:o:a:A:m:U:r:b:V:l:LdkKe:v:h" opt; do
|
while getopts ":w:j:i:t:o:a:A:m:U:r:b:V:l:LdkKNe:v:R:h" opt; do
|
||||||
case $opt in
|
case ${opt} in
|
||||||
w)
|
w)
|
||||||
WORKSPACE="${OPTARG}"
|
WORKSPACE="${OPTARG}"
|
||||||
;;
|
;;
|
||||||
|
@ -148,7 +139,7 @@ GetoptsVariables() {
|
||||||
ISO_PATH="${OPTARG}"
|
ISO_PATH="${OPTARG}"
|
||||||
;;
|
;;
|
||||||
t)
|
t)
|
||||||
TASK_NAME="${OPTARG}"
|
echo "Option 'TASK_NAME' deprecated."
|
||||||
;;
|
;;
|
||||||
o)
|
o)
|
||||||
TEST_OPTIONS="${TEST_OPTIONS} ${OPTARG}"
|
TEST_OPTIONS="${TEST_OPTIONS} ${OPTARG}"
|
||||||
|
@ -160,13 +151,13 @@ GetoptsVariables() {
|
||||||
NOSE_EVAL_ATTR="${OPTARG}"
|
NOSE_EVAL_ATTR="${OPTARG}"
|
||||||
;;
|
;;
|
||||||
m)
|
m)
|
||||||
USE_MIRROR="${OPTARG}"
|
echo "Option 'USE_MIRROR' deprecated."
|
||||||
;;
|
;;
|
||||||
U)
|
U)
|
||||||
ISO_URL="${OPTARG}"
|
ISO_URL="${OPTARG}"
|
||||||
;;
|
;;
|
||||||
r)
|
r)
|
||||||
ROTATE_ISO="${OPTARG}"
|
echo "Option 'ROTATE_ISO' deprecated."
|
||||||
;;
|
;;
|
||||||
b)
|
b)
|
||||||
BUILD_NUMBER="${OPTARG}"
|
BUILD_NUMBER="${OPTARG}"
|
||||||
|
@ -195,6 +186,12 @@ GetoptsVariables() {
|
||||||
v)
|
v)
|
||||||
VENV="no"
|
VENV="no"
|
||||||
;;
|
;;
|
||||||
|
R)
|
||||||
|
REQUIREMENTS_DIR="${OPTARG}"
|
||||||
|
;;
|
||||||
|
N)
|
||||||
|
UPDATE_REQUIREMENTS="yes"
|
||||||
|
;;
|
||||||
h)
|
h)
|
||||||
ShowHelp
|
ShowHelp
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -202,12 +199,12 @@ GetoptsVariables() {
|
||||||
\?)
|
\?)
|
||||||
echo "Invalid option: -$OPTARG"
|
echo "Invalid option: -$OPTARG"
|
||||||
ShowHelp
|
ShowHelp
|
||||||
exit $INVALIDOPTS_ERR
|
exit ${INVALIDOPTS_ERR}
|
||||||
;;
|
;;
|
||||||
:)
|
:)
|
||||||
echo "Option -$OPTARG requires an argument."
|
echo "Option -$OPTARG requires an argument."
|
||||||
ShowHelp
|
ShowHelp
|
||||||
exit $INVALIDOPTS_ERR
|
exit ${INVALIDOPTS_ERR}
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
@ -217,121 +214,20 @@ CheckVariables() {
|
||||||
|
|
||||||
if [ -z "${JOB_NAME}" ]; then
|
if [ -z "${JOB_NAME}" ]; then
|
||||||
echo "Error! JOB_NAME is not set!"
|
echo "Error! JOB_NAME is not set!"
|
||||||
exit $NOJOBNAME_ERR
|
exit ${NOJOBNAME_ERR}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${ISO_PATH}" ]; then
|
if [ -z "${ISO_PATH}" ]; then
|
||||||
echo "Error! ISO_PATH is not set!"
|
echo "Error! ISO_PATH is not set!"
|
||||||
exit $NOISOPATH_ERR
|
exit ${NOISOPATH_ERR}
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${TASK_NAME}" ]; then
|
|
||||||
echo "Error! TASK_NAME is not set!"
|
|
||||||
exit $NOTASKNAME_ERR
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${WORKSPACE}" ]; then
|
if [ -z "${WORKSPACE}" ]; then
|
||||||
echo "Error! WORKSPACE is not set!"
|
echo "Error! WORKSPACE is not set!"
|
||||||
exit $NOWORKSPACE_ERR
|
exit ${NOWORKSPACE_ERR}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
MakeISO() {
|
|
||||||
# Create iso file to be used in tests
|
|
||||||
|
|
||||||
# clean previous garbage
|
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
|
||||||
echo make deep_clean
|
|
||||||
else
|
|
||||||
make deep_clean
|
|
||||||
fi
|
|
||||||
ec="${?}"
|
|
||||||
|
|
||||||
if [ "${ec}" -gt "0" ]; then
|
|
||||||
echo "Error! Deep clean failed!"
|
|
||||||
exit $DEEPCLEAN_ERR
|
|
||||||
fi
|
|
||||||
|
|
||||||
# create ISO file
|
|
||||||
export USE_MIRROR
|
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
|
||||||
echo make iso
|
|
||||||
else
|
|
||||||
make iso
|
|
||||||
fi
|
|
||||||
ec=$?
|
|
||||||
|
|
||||||
if [ "${ec}" -gt "0" ]; then
|
|
||||||
echo "Error making ISO!"
|
|
||||||
exit $MAKEISO_ERR
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
|
||||||
ISO="${WORKSPACE}/build/iso/fuel.iso"
|
|
||||||
else
|
|
||||||
ISO="`ls ${WORKSPACE}/build/iso/*.iso | head -n 1`"
|
|
||||||
# check that ISO file exists
|
|
||||||
if [ ! -f "${ISO}" ]; then
|
|
||||||
echo "Error! ISO file not found!"
|
|
||||||
exit $NOISOFOUND_ERR
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# copy ISO file to storage dir
|
|
||||||
# if rotation is enabled and build number is available
|
|
||||||
# save iso to tagged file and symlink to the last build
|
|
||||||
# if rotation is not enabled just copy iso to iso_dir
|
|
||||||
|
|
||||||
if [ "${ROTATE_ISO}" = "yes" -a "${BUILD_NUMBER}" != "" ]; then
|
|
||||||
# copy iso file to shared dir with revision tagged name
|
|
||||||
NEW_BUILD_ISO_PATH="${ISO_PATH#.iso}_${BUILD_NUMBER}.iso"
|
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
|
||||||
echo cp "${ISO}" "${NEW_BUILD_ISO_PATH}"
|
|
||||||
else
|
|
||||||
cp "${ISO}" "${NEW_BUILD_ISO_PATH}"
|
|
||||||
fi
|
|
||||||
ec=$?
|
|
||||||
|
|
||||||
if [ "${ec}" -gt "0" ]; then
|
|
||||||
echo "Error! Copy ${ISO} to ${NEW_BUILD_ISO_PATH} failed!"
|
|
||||||
exit $COPYISO_ERR
|
|
||||||
fi
|
|
||||||
|
|
||||||
# create symlink to the last built ISO file
|
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
|
||||||
echo ln -sf "${NEW_BUILD_ISO_PATH}" "${ISO_PATH}"
|
|
||||||
else
|
|
||||||
ln -sf "${NEW_BUILD_ISO_PATH}" "${ISO_PATH}"
|
|
||||||
fi
|
|
||||||
ec=$?
|
|
||||||
|
|
||||||
if [ "${ec}" -gt "0" ]; then
|
|
||||||
echo "Error! Create symlink from ${NEW_BUILD_ISO_PATH} to ${ISO_PATH} failed!"
|
|
||||||
exit $SYMLINKISO_ERR
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# just copy file to shared dir
|
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
|
||||||
echo cp "${ISO}" "${ISO_PATH}"
|
|
||||||
else
|
|
||||||
cp "${ISO}" "${ISO_PATH}"
|
|
||||||
fi
|
|
||||||
ec=$?
|
|
||||||
|
|
||||||
if [ "${ec}" -gt "0" ]; then
|
|
||||||
echo "Error! Copy ${ISO} to ${ISO_PATH} failed!"
|
|
||||||
exit $COPYISO_ERR
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${ec}" -gt "0" ]; then
|
|
||||||
echo "Error! Copy ISO from ${ISO} to ${ISO_PATH} failed!"
|
|
||||||
exit $COPYISO_ERR
|
|
||||||
fi
|
|
||||||
echo "Finished building ISO: ${ISO_PATH}"
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
CdWorkSpace() {
|
CdWorkSpace() {
|
||||||
# chdir into workspace or fail if could not
|
# chdir into workspace or fail if could not
|
||||||
if [ "${DRY_RUN}" != "yes" ]; then
|
if [ "${DRY_RUN}" != "yes" ]; then
|
||||||
|
@ -340,13 +236,47 @@ CdWorkSpace() {
|
||||||
|
|
||||||
if [ "${ec}" -gt "0" ]; then
|
if [ "${ec}" -gt "0" ]; then
|
||||||
echo "Error! Cannot cd to WORKSPACE!"
|
echo "Error! Cannot cd to WORKSPACE!"
|
||||||
exit $CDWORKSPACE_ERR
|
exit ${CDWORKSPACE_ERR}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo cd "${WORKSPACE}"
|
echo cd "${WORKSPACE}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CheckRequirements() {
|
||||||
|
REQUIREMENTS_PATH="${WORKSPACE}/${REQUIREMENTS_DIR}"
|
||||||
|
|
||||||
|
if [ "${UPDATE_REQUIREMENTS}" = "yes" ]; then
|
||||||
|
if [ -f "${REQUIREMENTS_PATH}/requirements.txt" ]; then
|
||||||
|
# Install packages from requirements.txt
|
||||||
|
pip install -r "${REQUIREMENTS_PATH}/requirements.txt"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f "${REQUIREMENTS_PATH}/requirements-devops.txt" ]; then
|
||||||
|
# Try to install fuel-devops as a package, to controll that
|
||||||
|
# required version of fuel-devops is already installed.
|
||||||
|
# Installation will fail if fuel-devops is not installed or
|
||||||
|
# installed with correct version (until it is not a PyPi package)
|
||||||
|
pip install -r "${REQUIREMENTS_PATH}/requirements-devops.txt"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
ActivateVirtualenv() {
|
||||||
|
if [ -z "${VENV_PATH}" ]; then
|
||||||
|
VENV_PATH="/home/jenkins/venv-nailgun-tests"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# run python virtualenv
|
||||||
|
if [ "${VENV}" = "yes" ]; then
|
||||||
|
if [ "${DRY_RUN}" = "yes" ]; then
|
||||||
|
echo . ${VENV_PATH}/bin/activate
|
||||||
|
else
|
||||||
|
. ${VENV_PATH}/bin/activate
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
RunTest() {
|
RunTest() {
|
||||||
# Run test selected by task name
|
# Run test selected by task name
|
||||||
|
|
||||||
|
@ -354,7 +284,7 @@ RunTest() {
|
||||||
if [ ! -f "${ISO_PATH}" ]; then
|
if [ ! -f "${ISO_PATH}" ]; then
|
||||||
if [ -z "${ISO_URL}" -a "${DRY_RUN}" != "yes" ]; then
|
if [ -z "${ISO_URL}" -a "${DRY_RUN}" != "yes" ]; then
|
||||||
echo "Error! File ${ISO_PATH} not found and no ISO_URL (-U key) for downloading!"
|
echo "Error! File ${ISO_PATH} not found and no ISO_URL (-U key) for downloading!"
|
||||||
exit $NOISOFOUND_ERR
|
exit ${NOISOFOUND_ERR}
|
||||||
else
|
else
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
if [ "${DRY_RUN}" = "yes" ]; then
|
||||||
echo wget -c ${ISO_URL} -O ${ISO_PATH}
|
echo wget -c ${ISO_URL} -O ${ISO_PATH}
|
||||||
|
@ -362,27 +292,14 @@ RunTest() {
|
||||||
echo "No ${ISO_PATH} found. Trying to download file."
|
echo "No ${ISO_PATH} found. Trying to download file."
|
||||||
wget -c ${ISO_URL} -O ${ISO_PATH}
|
wget -c ${ISO_URL} -O ${ISO_PATH}
|
||||||
rc=$?
|
rc=$?
|
||||||
if [ $rc -ne 0 ]; then
|
if [ ${rc} -ne 0 ]; then
|
||||||
echo "Failed to fetch ISO from ${ISO_URL}"
|
echo "Failed to fetch ISO from ${ISO_URL}"
|
||||||
exit $ISODOWNLOAD_ERR
|
exit ${ISODOWNLOAD_ERR}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${VENV_PATH}" ]; then
|
|
||||||
VENV_PATH="/home/jenkins/venv-nailgun-tests"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# run python virtualenv
|
|
||||||
if [ "${VENV}" = "yes" ]; then
|
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
|
||||||
echo . $VENV_PATH/bin/activate
|
|
||||||
else
|
|
||||||
. $VENV_PATH/bin/activate
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${ENV_NAME}" = "" ]; then
|
if [ "${ENV_NAME}" = "" ]; then
|
||||||
ENV_NAME="${JOB_NAME}_system_test"
|
ENV_NAME="${JOB_NAME}_system_test"
|
||||||
fi
|
fi
|
||||||
|
@ -392,7 +309,7 @@ RunTest() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f "$LOGS_DIR" ]; then
|
if [ ! -f "$LOGS_DIR" ]; then
|
||||||
mkdir -p $LOGS_DIR
|
mkdir -p ${LOGS_DIR}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export ENV_NAME
|
export ENV_NAME
|
||||||
|
@ -425,18 +342,18 @@ RunTest() {
|
||||||
# run python test set to create environments, deploy and test product
|
# run python test set to create environments, deploy and test product
|
||||||
if [ "${DRY_RUN}" = "yes" ]; then
|
if [ "${DRY_RUN}" = "yes" ]; then
|
||||||
echo export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
|
echo export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
|
||||||
echo python fuelweb_test/run_tests.py -q --nologcapture --with-xunit ${OPTS}
|
echo python run_system_test.py run -q --nologcapture --with-xunit ${OPTS}
|
||||||
else
|
else
|
||||||
export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
|
export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
|
||||||
echo ${PYTHONPATH}
|
echo ${PYTHONPATH}
|
||||||
python fuelweb_test/run_tests.py -q --nologcapture --with-xunit ${OPTS}
|
python run_system_test.py run -q --nologcapture --with-xunit ${OPTS}
|
||||||
|
|
||||||
fi
|
fi
|
||||||
ec=$?
|
ec=$?
|
||||||
|
|
||||||
# Extract logs using fuel_logs utility
|
# Extract logs using fuel_logs utility
|
||||||
if [ "${FUELLOGS_TOOL}" != "no" ]; then
|
if [ "${FUELLOGS_TOOL}" != "no" ]; then
|
||||||
for logfile in $(find "${LOGS_DIR}" -name "fail*.tar.xz" -type f);
|
for logfile in $(find "${LOGS_DIR}" -name "fail*.tar.[gx]z" -type f);
|
||||||
do
|
do
|
||||||
./utils/jenkins/fuel_logs.py "${logfile}" > "${logfile}.filtered.log"
|
./utils/jenkins/fuel_logs.py "${logfile}" > "${logfile}.filtered.log"
|
||||||
done
|
done
|
||||||
|
@ -454,26 +371,6 @@ RunTest() {
|
||||||
exit "${ec}"
|
exit "${ec}"
|
||||||
}
|
}
|
||||||
|
|
||||||
RouteTasks() {
|
|
||||||
# this selector defines task names that are recognised by this script
|
|
||||||
# and runs corresponding jobs for them
|
|
||||||
# running any jobs should exit this script
|
|
||||||
|
|
||||||
case "${TASK_NAME}" in
|
|
||||||
test)
|
|
||||||
RunTest
|
|
||||||
;;
|
|
||||||
iso)
|
|
||||||
MakeISO
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unknown task: ${TASK_NAME}!"
|
|
||||||
exit $INVALIDTASK_ERR
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# MAIN
|
# MAIN
|
||||||
|
|
||||||
# first we want to get variable from command line options
|
# first we want to get variable from command line options
|
||||||
|
@ -488,5 +385,11 @@ CheckVariables
|
||||||
# first we chdir into our working directory unless we dry run
|
# first we chdir into our working directory unless we dry run
|
||||||
CdWorkSpace
|
CdWorkSpace
|
||||||
|
|
||||||
# finally we can choose what to do according to TASK_NAME
|
# Activate python virtual environment
|
||||||
RouteTasks
|
ActivateVirtualenv
|
||||||
|
|
||||||
|
# Check/update PyPi requirements
|
||||||
|
CheckRequirements
|
||||||
|
|
||||||
|
# Run the test
|
||||||
|
RunTest
|
||||||
|
|
Loading…
Reference in New Issue