From bc9b769c193474dd59ccc34184f05f42d73e2570 Mon Sep 17 00:00:00 2001 From: Steve Kuznetsov Date: Thu, 5 Jan 2017 16:37:04 -0500 Subject: [PATCH] Add CentOS 7 and Fedora 25 tests, remove Fedora 21 tests Signed-off-by: Steve Kuznetsov --- hacking/runtests.sh | 5 ++-- hacking/titotest-centos-7/Dockerfile | 38 +++++++++++++++++++++++++++ hacking/titotest-fedora-21/Dockerfile | 37 -------------------------- hacking/titotest-fedora-21/README.md | 1 - hacking/titotest-fedora-25/Dockerfile | 30 +++++++++++++++++++++ 5 files changed, 71 insertions(+), 40 deletions(-) create mode 100644 hacking/titotest-centos-7/Dockerfile delete mode 100644 hacking/titotest-fedora-21/Dockerfile delete mode 120000 hacking/titotest-fedora-21/README.md create mode 100644 hacking/titotest-fedora-25/Dockerfile diff --git a/hacking/runtests.sh b/hacking/runtests.sh index 1d890a6..0e1fdee 100755 --- a/hacking/runtests.sh +++ b/hacking/runtests.sh @@ -64,12 +64,13 @@ distros=' titotest-centos-6 -titotest-fedora-21 +titotest-centos-7 +titotest-fedora-25 titotest-fedora-rawhide ' python3_distros=' -titotest-fedora-21 +titotest-fedora-25 titotest-fedora-rawhide ' diff --git a/hacking/titotest-centos-7/Dockerfile b/hacking/titotest-centos-7/Dockerfile new file mode 100644 index 0000000..62cb2c0 --- /dev/null +++ b/hacking/titotest-centos-7/Dockerfile @@ -0,0 +1,38 @@ +FROM centos:7 +MAINTAINER Steve Kuznetsov + +RUN yum -y install epel-release +RUN yum -y install \ + git \ + git-annex \ + python-bugzilla \ + python-mock \ + python-nose \ + python-pep8 \ + rpm-build \ + createrepo \ + tar \ + python-devel \ + which \ + asciidoc \ + docbook-style-xsl \ + libxslt \ + rpmdevtools \ + python-blessings \ + && yum clean all + +RUN useradd sandbox +RUN git config --system user.email "sandbox@example.com" +RUN git config --system user.name "sandbox" +ADD tito.spec /tmp/tito.spec +RUN yum -y install yum-utils \ + && yum-builddep -y /tmp/tito.spec \ + && yum clean all + +USER sandbox +VOLUME ["/home/sandbox"] +WORKDIR /home/sandbox + + +ENV LANG C +CMD ["/bin/bash"] diff --git a/hacking/titotest-fedora-21/Dockerfile b/hacking/titotest-fedora-21/Dockerfile deleted file mode 100644 index f1be0c4..0000000 --- a/hacking/titotest-fedora-21/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# https://index.docker.io/_/fedora/ -FROM fedora:21 - -# http://jumanjiman.github.io/ -MAINTAINER Paul Morgan - -# Install build dependencies. -RUN yum -y install \ - yum-utils \ - git-annex \ - python-devel \ - python-mock \ - python-nose \ - python-blessings \ - python-pep8 \ - python3-mock \ - python3-nose \ - python3-blessings \ - python3-pep8 - -RUN useradd sandbox -RUN git config --system user.email "sandbox@example.com" -RUN git config --system user.name "sandbox" - -# NOTE: runtests.sh hard-links tito.spec into this directory on-the-fly -# to work around https://github.com/dotcloud/docker/issues/1676 -ADD tito.spec /tmp/tito.spec - -RUN yum-builddep -y /tmp/tito.spec -RUN yum clean all - -USER sandbox -VOLUME ["/home/sandbox"] -WORKDIR /home/sandbox - -ENV LANG C -CMD ["/bin/bash"] diff --git a/hacking/titotest-fedora-21/README.md b/hacking/titotest-fedora-21/README.md deleted file mode 120000 index fb50ac9..0000000 --- a/hacking/titotest-fedora-21/README.md +++ /dev/null @@ -1 +0,0 @@ -../../HACKING \ No newline at end of file diff --git a/hacking/titotest-fedora-25/Dockerfile b/hacking/titotest-fedora-25/Dockerfile new file mode 100644 index 0000000..8181450 --- /dev/null +++ b/hacking/titotest-fedora-25/Dockerfile @@ -0,0 +1,30 @@ +FROM fedora:25 +MAINTAINER Steve Kuznetsov + +RUN dnf -y install \ + yum-utils \ + git-annex \ + python2 \ + python-devel \ + python-mock \ + python-nose \ + python-blessings \ + python-pep8 \ + python3-mock \ + python3-nose \ + python3-blessings \ + python3-pep8 + +RUN useradd sandbox +RUN git config --system user.email "sandbox@example.com" +RUN git config --system user.name "sandbox" +ADD tito.spec /tmp/tito.spec +RUN yum-builddep -y /tmp/tito.spec +RUN dnf clean all + +USER sandbox +VOLUME ["/home/sandbox"] +WORKDIR /home/sandbox + +ENV LANG C +CMD ["/bin/bash"]