From 78b27e3e6017ceda4e15c5b2c87516ec3750fd98 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Thu, 14 May 2015 21:15:40 -0700 Subject: Clean up the image functional test 1. Move setup_docker.sh to tools directory 2. Make a setup_gate.sh that installs necessary packages including docker and starts docker. 3. Add logging output. 4. Add default test timeout of 2 hours. 5. Add user to the docker group before running test cases. 6. Run image build as dockerroot group. This patch has to be one commit to fix the gate in one go. Co-Authored-By: Steven Dake Change-Id: I83f3cdb1dabf0dfface589c581cb22c155467acc --- tests/setup_docker.sh | 73 --------------------------------------------------- tests/setup_gate.sh | 14 ++++++++++ tests/test_images.py | 50 ++++++++++++++++++++++++----------- 3 files changed, 49 insertions(+), 88 deletions(-) delete mode 100755 tests/setup_docker.sh create mode 100755 tests/setup_gate.sh (limited to 'tests') diff --git a/tests/setup_docker.sh b/tests/setup_docker.sh deleted file mode 100755 index 6be1ebeec..000000000 --- a/tests/setup_docker.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -# -# This script is used to setup Kolla Docker environment, -# after running this script, you can run Kolla functional test. -# NOTE: This script was only tested on redhat/debian/suse platform families. -# - -set -xu - -DOCKER_MIN_VERSION=1.6.0 - -function check_prerequisites() { - if [[ $EUID -ne 0 ]]; then - echo "You must execute this script as root." 1>&2 - exit 1 - fi - if [ "$OSTYPE" != "linux-gnu" ]; then - echo Platform not supported - exit 255 - fi - if [ "$HOSTTYPE" != "x86_64" ]; then - echo Machine type not supported - exit 255 - fi -} - -function check_docker_version() { - local docker_version - local result - if type docker &>/dev/null; then - docker_version=$(docker --version 2>/dev/null | awk -F"[ ,]" '{print $3}') - result=$(awk 'BEGIN{print '$docker_version' >= '$DOCKER_MIN_VERSION'}') - if [ $result = 1 ]; then - return 0 - fi - fi - return 1 -} - -function start_docker() { - pkill -x -9 docker - if check_docker_version; then - docker -d &>/dev/null & - else - curl -sSL https://get.docker.com/builds/Linux/x86_64/docker-$DOCKER_MIN_VERSION -o /usr/local/bin/docker - chmod +x /usr/local/bin/docker - /usr/local/bin/docker -d &>/dev/null & - fi -} - -function create_group() { - getent group docker - result=$? - if [ $result -eq 0 ]; then # 0: key already exists, nothing to do - return - elif [ $result -eq 2 ]; then # 2: key could not be found in database - groupadd docker - chown root:docker /var/run/docker.sock - usermod -a -G docker ${SUDO_USER:-$USER} - else - echo Unexpected failure: $result - exit - fi -} - -# Check for root privileges and correct platform -check_prerequisites - -# Start Docker service -start_docker - -# Ensure executing user is placed in the docker group -create_group diff --git a/tests/setup_gate.sh b/tests/setup_gate.sh new file mode 100755 index 000000000..43b4e41b8 --- /dev/null +++ b/tests/setup_gate.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -e + +sudo yum install -y libffi-devel openssl-devel docker +sudo /usr/sbin/usermod -a -G dockerroot ${SUDO_USER:-$USER} +sudo systemctl start docker +sleep 1 + +group_str="jenkins ALL=(:dockerroot) NOPASSWD: ALL" +sudo grep -x "$group_str" /etc/sudoers > /dev/null || sudo bash -c "echo \"$group_str\" >> /etc/sudoers" +sudo chown root:dockerroot /var/run/docker.sock + +echo "Completed $0." diff --git a/tests/test_images.py b/tests/test_images.py index f0e45368d..b3821fcf5 100644 --- a/tests/test_images.py +++ b/tests/test_images.py @@ -10,33 +10,53 @@ # License for the specific language governing permissions and limitations # under the License. -import testtools -from subprocess import check_output +from oslo_log import fixture as log_fixture +from oslo_log import log as logging +from oslotest import base -class ImagesTest(testtools.TestCase): +from subprocess import Popen, PIPE, STDOUT + +LOG = logging.getLogger(__name__) + +class ImagesTest(base.BaseTestCase): def setUp(self): super(ImagesTest, self).setUp() + self.useFixture(log_fixture.SetLogLevel([__name__], + logging.logging.INFO)) def test_builds(self): - build_output = check_output(["tools/build-all-docker-images", - "--release", - "--pull", - "--testmode"]) + proc = Popen(['tools/build-all-docker-images', + '--testmode'], + stdout=PIPE, stderr=STDOUT, bufsize=1) + with proc.stdout: + for line in iter(proc.stdout.readline, b''): + LOG.info(line.strip()) + proc.wait() # these are images that are known to not build properly - excluded_images = ["kollaglue/centos-rdo-swift-proxy-server", + excluded_images = ["kollaglue/centos-rdo-swift-base", + "kollaglue/centos-rdo-swift-object", + "kollaglue/centos-rdo-swift-proxy-server", "kollaglue/centos-rdo-swift-container", - "kollaglue/centos-rdo-swift-base", "kollaglue/centos-rdo-swift-account", - "kollaglue/centos-rdo-swift-object", - "kollaglue/centos-rdo-barbican", - "kollaglue/fedora-rdo-base", + "kollaglue/centos-rdo-zaqar", "kollaglue/centos-rdo-rhel-osp-base"] - results = eval(build_output.splitlines()[-1]) + results = eval(line) + failures = 0 for image, result in results.iteritems(): if image in excluded_images: - self.assertEqual(result, 'fail') + if result is 'fail': + continue + failures = failures + 1 + LOG.warning(">>> Expected image '%s' to fail, please update" + " the excluded_images in source file above if the" + " image build has been fixed." % image) else: - self.assertNotEqual(result, 'fail') + if result is not 'fail': + continue + failures = failures + 1 + LOG.critical(">>> Expected image '%s' to succeed!" % image) + + self.assertEqual(failures, 0, "%d failure(s) occurred" % failures) -- cgit v1.2.3