Skip to content

Commit

Permalink
Issues: Install test does not test validity of packages (rpm/deb)
Browse files Browse the repository at this point in the history
Fixes F5Networks#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.
  • Loading branch information
sorensF5 committed Jan 24, 2017
1 parent d7ea8ff commit 4fc0ac5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -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"]
Original file line number Diff line number Diff line change
Expand Up @@ -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+)')
Expand Down

0 comments on commit 4fc0ac5

Please sign in to comment.