From 4fc0ac5ce157bea93e51c7f0a21da9e32d24e61a Mon Sep 17 00:00:00 2001 From: ssorenso Date: Mon, 23 Jan 2017 13:58:14 -0700 Subject: [PATCH] Issues: Install test does not test validity of packages (rpm/deb) Fixes #494 Problem: The test install algorithm to work with a more generic pool Analysis: I made the changes to make it so that the .deb and .rpm install tests would do what they're supposed to do. Before this change, the .deb and .rpm failures were not being properly tracked and would always fail due to improper regExp handling of expected strings. Tests: This is a test. To validate that this executes properly, use the .travis_yml file in its normal execution phasing. --- .../Docker/redhat/install_test/Dockerfile.centos7 | 7 +++++++ .../Docker/redhat/install_test/fetch_and_install_deps.py | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/f5-openstack-agent-dist/Docker/redhat/install_test/Dockerfile.centos7 b/f5-openstack-agent-dist/Docker/redhat/install_test/Dockerfile.centos7 index a05505cc2..1b71ade61 100644 --- a/f5-openstack-agent-dist/Docker/redhat/install_test/Dockerfile.centos7 +++ b/f5-openstack-agent-dist/Docker/redhat/install_test/Dockerfile.centos7 @@ -1,5 +1,12 @@ +# Dockerfile FROM centos:7 RUN yum update -y && yum install git python-requests -y COPY ./fetch_and_install_deps.py / + +RUN chmod 500 /fetch_and_install_deps.py + +ENTRYPOINT ["/fetch_and_install_deps", "/var/wdir"] +# by default, the following will be used for the last execution: +CMD ["/var/wdir/f5-openstack-agent-dist/rpms/build/f5-openstack-agent-*.el7.noarch.rpm"] diff --git a/f5-openstack-agent-dist/Docker/redhat/install_test/fetch_and_install_deps.py b/f5-openstack-agent-dist/Docker/redhat/install_test/fetch_and_install_deps.py index 367d801a1..81108aaec 100755 --- a/f5-openstack-agent-dist/Docker/redhat/install_test/fetch_and_install_deps.py +++ b/f5-openstack-agent-dist/Docker/redhat/install_test/fetch_and_install_deps.py @@ -8,7 +8,6 @@ from collections import deque, namedtuple -f5_sdk_pattern = re.compile("^f5-sdk\s*=\s*(\d+\.\d+\.\d+)$") f5_icontrol_rest_pattern = re.compile( "^f5-icontrol-rest\s*=\s*(\d+\.\d+\.\d+)$") dep_match_re = re.compile('^((python|f5-sdk)[\w\-]*)\s([<>=]{1,2})\s(\S+)')