From 03196239a7b24d29c898661ad080f67e88f485ba Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Thu, 7 Dec 2017 11:12:11 -0400 Subject: [PATCH] Fix rsync failures in dockerized tests, update for F27. --- .tito/releasers.conf | 2 +- hacking/runtests.sh | 4 ++-- hacking/{titotest-fedora-25 => titotest-fedora-27}/Dockerfile | 3 ++- hacking/titotest-fedora-rawhide/Dockerfile | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) rename hacking/{titotest-fedora-25 => titotest-fedora-27}/Dockerfile (95%) diff --git a/.tito/releasers.conf b/.tito/releasers.conf index 95a44ee..6f22532 100644 --- a/.tito/releasers.conf +++ b/.tito/releasers.conf @@ -30,7 +30,7 @@ git_url = git://example.com [fedora] releaser = tito.release.FedoraGitReleaser -branches = master f25 f24 el6 epel7 +branches = master f27 f26 el6 epel7 [copr-dgoodwin] releaser = tito.release.CoprReleaser diff --git a/hacking/runtests.sh b/hacking/runtests.sh index 1765d00..c1def4d 100755 --- a/hacking/runtests.sh +++ b/hacking/runtests.sh @@ -62,12 +62,12 @@ readonly default_python2_distros=( centos-6 centos-7 - fedora-25 + fedora-27 fedora-rawhide ) readonly default_python3_distros=( - fedora-25 + fedora-27 fedora-rawhide ) diff --git a/hacking/titotest-fedora-25/Dockerfile b/hacking/titotest-fedora-27/Dockerfile similarity index 95% rename from hacking/titotest-fedora-25/Dockerfile rename to hacking/titotest-fedora-27/Dockerfile index 255e0c3..4aa5c68 100644 --- a/hacking/titotest-fedora-25/Dockerfile +++ b/hacking/titotest-fedora-27/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:25 +FROM fedora:27 MAINTAINER Steve Kuznetsov # Manually install python2 deps since spec won't add them @@ -17,6 +17,7 @@ RUN dnf -y install \ python3-nose \ python3-blessings \ python3-pep8 \ + rsync \ createrepo_c RUN useradd sandbox diff --git a/hacking/titotest-fedora-rawhide/Dockerfile b/hacking/titotest-fedora-rawhide/Dockerfile index cd0d57c..3dc3126 100644 --- a/hacking/titotest-fedora-rawhide/Dockerfile +++ b/hacking/titotest-fedora-rawhide/Dockerfile @@ -23,6 +23,7 @@ RUN dnf -y install \ python3-nose \ python3-blessings \ python3-pep8 \ + rsync \ createrepo_c RUN useradd sandbox