diskimage-builder/tests/run_functests.sh

451 lines
13 KiB
Bash
Raw Normal View History

#!/bin/bash
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
set -eu
set -o pipefail
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
BASE_DIR=$(cd $(dirname "$0")/.. && pwd)
# then execute tests for elements
export DIB_CMD="disk-image-create"
Move elements & lib relative to diskimage_builder package Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
2016-09-09 03:11:52 +00:00
export DIB_ELEMENTS=$(python -c '
import diskimage_builder.paths
diskimage_builder.paths.show_path("elements")')
# Setup sane locale defaults, because this information is leaked into DIB.
export LANG=en_US.utf8
export LC_ALL=
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
#
# Default skip tests
#
# For time reasons, we do not run these tests by default; i.e. these
# tests are not run by "tox -e func" in the gate.
#
DEFAULT_SKIP_TESTS=(
## These are part of the "extras-nv" job
# These require "zypper" on the host which is not available on
# all platforms
opensuse-minimal/build-succeeds
opensuse-minimal/opensuse15-build-succeeds
# non-voting; not used by infra currently
gentoo/build-succeeds
# Needs infra mirroring to move to voting job
debian-minimal/stable-build-succeeds
debian-minimal/stable-vm
##
# These download base images which has shown to be very unreliable
# in the gate. Keep them in a -nv job until we can figure out
# better caching for the images
opensuse/build-succeeds
opensuse/opensuse15-build-succeeds
centos7/build-succeeds
debian/build-succeeds
fedora/build-succeeds
ubuntu/trusty-build-succeeds
ubuntu/xenial-build-succeeds
ubuntu/bionic-build-succeeds
# No longer reasonable to test upstream (lacks a mirror in infra)
# Note this is centos6 and should probably be removed
centos/build-succeeds
# This job is a bit unreliable, even if we get mirroring
debian-minimal/testing-build-succeeds
# Replaced by bionic
ubuntu-minimal/trusty-build-succeeds
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
)
# The default output formats (specified to disk-image-create's "-t"
# command. Elements can override with a test-output-formats file
DEFAULT_OUTPUT_FORMATS="tar"
function log_with_prefix {
local pr=$1
local log
while read a; do
log="[$pr] $a"
Add timestamp output filter This adds a devstack-inspired output filter to standardise timestamping. Currently, python tools timestamp always (timestamp setup in logging_config.py) but all the surrounding bash does not. We have extra timestamps added in run_functests.sh for our own purposes to get the bash timestamps; but this ends up giving us double-timestamps for the python bits. Additionally, callers such as nodepool capture our output and put their own timestamps on it, and again have the double-timestamps. This uses a lightly modified outfilter.py from devstack to standardise this. All output is run through this filter, which will timestamp it. I have removed the places where we double-timestamp -- logging_config.py and the prefix in dib-run-parts. An env option is added to turn timestamps off completely (does not seem worth taking up a command-line option for). For callers like nodepool, they can set this and will just have their own timestamps as they collect the lines. Since all logging is going through outfilter, it's easy to add a --logfile option. I think this will be quite handy; personally I'm always redirecting dib runs to files for debugging. I've also added a "quiet" option. I think this could be useful in run_tests.sh if we were to start logging the output of each test to individual files. This would be much easier to deal with than the very large log files we get (especially if we wanted to turn on parallel running...) Change-Id: I202e1cb200bde17f6d7770cf1e2710bbf4cca64c
2017-06-16 02:09:24 +00:00
# note: dib logs have timestamp by default now
echo "${log}"
done
}
# Log job control messages
function log_jc {
local msg="$1"
local log="[JOB-CONTROL] ${msg}"
if [[ ${LOG_DATESTAMP} -ne 0 ]]; then
log="$(date +"%Y%m%d-%H%M%S.%N") ${log}"
fi
echo "${log}"
}
function job_cnt {
running_jobs=$(jobs -p)
echo ${running_jobs} | wc -w
}
# This is needed, because the better 'wait -n' is
# available since bash 4.3 only.
function wait_minus_n {
if [ "${BASH_VERSINFO[0]}" -gt 4 \
-o "${BASH_VERSINFO[0]}" = 4 \
-a "${BASH_VERSINFO[1]}" -ge 3 ]; then
# Good way: wait on any job
wait -n
return $?
else
# Not that good way: wait on one specific job
# (others may be finished in the mean time)
local wait_for_pid=$(jobs -p | head -1)
wait ${wait_for_pid}
return $?
fi
}
# This takes the status and the "$logfile" argument passed to
# disk-image-create and renames the file, so you can quickly see
# in results which tests have failed.
function logfile_status {
local status="$1"
local arg="$2"
local filename
if [[ -z "${arg// }" ]]; then
return
fi
filename="$(echo $arg | cut -f2 -d' ')"
echo "Moving ${filename} to ${filename/.log/.$status.log}"
mv "$filename" ${filename/.log/.$status.log}
}
# run_disk_element_test <test_element> <element> <use_tmp> <output_format> <logfile>
# Run a disk-image-build build of ELEMENT including any elements
# specified by TEST_ELEMENT. Pass OUTPUT_FORMAT to "-t"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
function run_disk_element_test() {
local test_element=$1
local element=$2
local dont_use_tmp=$3
local output_format="$4"
local logfile="$5"
local use_tmp_flag=""
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
local dest_dir=$(mktemp -d)
if [[ ${KEEP_OUTPUT} -ne 1 ]]; then
trap "rm -rf $dest_dir" EXIT
fi
if [ "${dont_use_tmp}" = "yes" ]; then
use_tmp_flag="--no-tmpfs"
fi
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
if break="after-error" break_outside_target=1 \
break_cmd="cp -v \$TMP_MOUNT_PATH/tmp/dib-test-should-fail ${dest_dir} || true" \
DIB_SHOW_IMAGE_USAGE=1 \
Move elements & lib relative to diskimage_builder package Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
2016-09-09 03:11:52 +00:00
ELEMENTS_PATH=$DIB_ELEMENTS/$element/test-elements \
$DIB_CMD -x -t ${output_format} \
${use_tmp_flag} \
${logfile} \
-o $dest_dir/image -n $element $test_element 2>&1 \
| log_with_prefix "${element}/${test_element}"; then
if [[ "qcow2" =~ "$output_format" ]]; then
if ! [ -f "$dest_dir/image.qcow2" ]; then
echo "Error: qcow2 build failed for element: $element, test-element: $test_element."
echo "No image $dest_dir/image.qcow2 found!"
logfile_status "FAIL" "${logfile}"
exit 1
fi
fi
# check inside the tar for sentinel files
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
if ! [ -f "$dest_dir/image.tar" ]; then
echo "Error: Build failed for element: $element, test-element: $test_element."
echo "No image $dest_dir/image.tar found!"
logfile_status "FAIL" "${logfile}"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
exit 1
else
if tar -tf $dest_dir/image.tar | grep -q /tmp/dib-test-should-fail; then
echo "Error: Element: $element, test-element $test_element should have failed, but passed."
logfile_status "FAIL" "${logfile}"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
exit 1
else
echo "PASS: Element $element, test-element: $test_element"
logfile_status "PASS" "${logfile}"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
fi
fi
else
if [ -f "${dest_dir}/dib-test-should-fail" ]; then
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
echo "PASS: Element $element, test-element: $test_element"
logfile_status "PASS" "${logfile}"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
else
echo "Error: Build failed for element: $element, test-element: $test_element."
logfile_status "FAIL" "${logfile}"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
exit 1
fi
fi
rm -f /tmp/dib-test-should-fail
if [[ ${KEEP_OUTPUT} -ne 1 ]]; then
# reset trap and cleanup
trap EXIT
rm -rf $dest_dir
fi
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
}
# run_ramdisk_element_test <test_element> <element> <use_tmp> <output_formats>
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
# Run a disk-image-builder default build of ELEMENT including any
# elements specified by TEST_ELEMENT
function run_ramdisk_element_test() {
local test_element=$1
local element=$2
local dont_use_tmp=$3
local output_format="$4" # ignored here
local logfile="$5"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
local dest_dir=$(mktemp -d)
local use_tmp_flag=""
if [ "${dont_use_tmp}" = "yes" ]; then
use_tmp_flag="--no-tmpfs"
fi
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
if ELEMENTS_PATH=$DIB_ELEMENTS/$element/test-elements \
$DIB_CMD -x -o ${dest_dir}/image \
${logfile} \
${use_tmp_flag} \
${element} ${test_element} 2>&1 \
| log_with_prefix "${element}/${test_element}"; then
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
# TODO(dtantsur): test also kernel presence once we sort out its naming
# problem (vmlinuz vs kernel)
if ! [ -f "$dest_dir/image.initramfs" ]; then
echo "Error: Build failed for element: $element, test-element: $test_element."
echo "No image $dest_dir/image.initramfs found!"
logfile_status "FAIL" "${logfile}"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
exit 1
else
echo "PASS: Element $element, test-element: $test_element"
logfile_status "PASS" "${logfile}"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
fi
else
echo "Error: Build failed for element: $element, test-element: $test_element."
logfile_status "FAIL" "${logfile}"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
exit 1
fi
}
#
# run_functests.sh
# run the functional tests for dib elements
#
# find elements that have functional test elements. TESTS will be an
# array with each value being "element/test-element"
TESTS=()
for e in $DIB_ELEMENTS/*/test-elements/*; do
test_element=$(echo $e | awk 'BEGIN {FS="/"}{print $NF}')
element=$(echo $e | awk 'BEGIN {FS="/"}{print $(NF-2)}')
TESTS+=("$element/$test_element")
done
#
# Default values
#
JOB_MAX_CNT=1
LOG_DATESTAMP=0
KEEP_OUTPUT=0
LOG_DIRECTORY=''
#
# Parse args
#
while getopts ":hlj:tL:" opt; do
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
case $opt in
h)
echo "run_functests.sh [-h] [-l] <test> <test> ..."
echo " -h : show this help"
echo " -l : list available tests"
echo " -j : parallel job count (default to 1)"
echo " -t : prefix log messages with timestamp"
echo " -k : keep output directories"
echo " -L : output logs into this directory"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
echo " <test> : functional test to run"
echo " Special test 'all' will run all tests"
exit 0
;;
l)
echo "The available functional tests are:"
echo
for t in ${TESTS[@]}; do
echo -n " $t"
if [[ " ${DEFAULT_SKIP_TESTS[@]} " =~ " ${t} " ]]; then
echo " [skip]"
else
echo " [run]"
fi
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
done
echo
exit 0
;;
j)
JOB_MAX_CNT=${OPTARG}
echo "Running parallel - using [${JOB_MAX_CNT}] jobs"
;;
t)
LOG_DATESTAMP=1
;;
k)
KEEP_OUTPUT=1
;;
L)
LOG_DIRECTORY=${OPTARG}
;;
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
\?)
echo "Invalid option: -$OPTARG"
exit 1
;;
esac
done
shift $((OPTIND-1))
DONT_USE_TMP="no"
if [ "${JOB_MAX_CNT}" -gt 1 ]; then
# switch off using tmp dir for image building
# (The mem check using the tmp dir is currently done
# based on the available memory - and not on the free.
# See #1618124 for more details)
DONT_USE_TMP="yes"
fi
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
# cull the list of tests to run into TESTS_TO_RUN
TESTS_TO_RUN=()
title=""
if [[ -z "$@" ]]; then
# remove the skipped tests
title="Running default tests:"
for test in "${TESTS[@]}"; do
if [[ " ${DEFAULT_SKIP_TESTS[@]} " =~ " ${test} " ]]; then
continue
else
TESTS_TO_RUN+=("${test}")
fi
done
elif [[ $1 == "all" ]]; then
title="Running all tests:"
TESTS_TO_RUN=("${TESTS[@]}")
else
title="Running specified tests:"
for test in $@; do
if [[ ! " ${TESTS[@]} " =~ " ${test} " ]]; then
echo "${test} : not a known test (see -l)"
exit 1
fi
TESTS_TO_RUN+=("${test}")
done
fi
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
if [[ -n "${LOG_DIRECTORY}" ]]; then
mkdir -p "${LOG_DIRECTORY}"
export DIB_QUIET=1
fi
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
# print a little status info
echo "------"
echo ${title}
for test in "${TESTS_TO_RUN[@]}"; do
echo " ${test}"
done
echo "------"
function wait_and_exit_on_failure {
local pid=$1
wait ${pid}
result=$?
if [ "${result}" -ne 0 ]; then
exit ${result}
fi
return 0
}
EXIT_CODE=0
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
for test in "${TESTS_TO_RUN[@]}"; do
running_jobs_cnt=$(job_cnt)
log_jc "Number of running jobs [${running_jobs_cnt}] max jobs [${JOB_MAX_CNT}]"
if [ "${running_jobs_cnt}" -ge "${JOB_MAX_CNT}" ]; then
log_jc "Waiting for job to finish"
wait_minus_n
result=$?
if [ "${result}" -ne 0 ]; then
EXIT_CODE=1
# If a job fails, do not start any new ones.
break
fi
fi
log_jc "Starting new job"
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
# from above; each array value is element/test_element. split it
# back up
element=${test%/*}
test_element=${test#*/}
element_dir=$DIB_ELEMENTS/${element}/test-elements/${test_element}/
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
# tests default to disk-based, but "element-type" can optionally
# override that
element_type=disk
element_type_override=${element_dir}/element-type
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
if [ -f ${element_type_override} ]; then
element_type=$(cat ${element_type_override})
fi
# override the output format if specified
element_output=${DEFAULT_OUTPUT_FORMATS}
element_output_override=${element_dir}/test-output-formats
if [ -f $element_output_override ]; then
element_output=$(cat ${element_output_override})
fi
log_argument=' '
if [[ -n "${LOG_DIRECTORY}" ]]; then
log_argument="--logfile ${LOG_DIRECTORY}/${element}_${test_element}.log"
fi
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
echo "Running $test ($element_type)"
run_${element_type}_element_test \
$test_element $element \
${DONT_USE_TMP} "${element_output}" "$log_argument" &
Rework functional test runner This simplifies and enhances the functional-test runner script for much better interactive behaviour and to give us the ability to better choose what is running in CI. Firstly, I have split the image-output testing into a separate script. This is not actually part of the functional testing of elements and is both logically and functionally different. It currently does not run in upstream CI because we don't have docker in the images. I have nothing against it, but it can be it's own thing. run_functests.sh is overhauled to have a useful interactive interface, e.g. --- $ ./run_functests.sh -h run_functests.sh [-h] [-l] <test> <test> ... -h : show this help -l : list available tests <test> : functional test to run Special test 'all' will run all tests $ ./run_functests.sh -l The available functional tests are: apt-sources/test-sources debian/build-succeeds fedora/build-succeeds fedora/build-succeeds-f21 ironic-agent/build-succeeds-fedora --- As described there, you can run a single test, a number of tests, the default tests (as CI will do) or all tests. Running all tests is too much for regular CI, but currently the only way to stop a low priority test running, or temporarily pause is to remove it completely -- clearly sub-optimal (see I93c2990472e88ab3e5ff14db56b4ff1b4dd965ef). There is nothing complicated about this, and to further simplify I have merged the runner functions back into run_functests.sh which remains a very modest ~150 lines, with most of that being argument sanity. With that and the image-format cleanup, we can remove the indirection of the 3 small library files. For consistency, I have renamed the "dib_functions_test" (that tests things from the dib functions library) with a run_* prefix. Because the default list is the same as the current functional tests run, this does not modify the status-quo. I plan to modify this, however, to run fedora-minimal & centos-minimal tests in a future change, as these are required to be stable for openstack ci. Documentation is updated, and a README.rst is added in the tests directory for discoverability. Change-Id: I86d208bd34ff09a29fdb916a4e7ef740c7f65af8
2016-02-05 03:54:50 +00:00
done
# Wait for the rest of the jobs
while true; do
running_jobs_cnt=$(job_cnt)
log_jc "Number of running jobs left [${running_jobs_cnt}]"
if [ "${running_jobs_cnt}" -eq 0 ]; then
break;
fi
wait_minus_n
result=$?
if [ "${result}" -ne 0 ]; then
EXIT_CODE=1
fi
done
if [ "${EXIT_CODE}" -eq 0 ]; then
echo "Tests passed!"
exit 0
else
echo "At least one test failed"
exit 1
fi