diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index 5e622db..bd1694d 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -7,7 +7,8 @@ if [ ! -e /usr/share/lorax/templates.d/80-rhel/ ]; then fi # Gather up the list of system repo files and use them for lorax -REPOS=$(for f in /etc/yum.repos.d/*repo; do echo -n "--repo $f "; done) +# Skip centos-addons and all epel repos, these cause conflicts with other release packages +REPOS=$(find /etc/yum.repos.d/ -maxdepth 1 -type f -name '*\.repo' ! -name 'centos-addons.repo' ! -name 'epel*' -exec echo -n "--repo {} " \;) if [ -z "$REPOS" ]; then echo "No system repos found" exit 1