Update Fedora tests to use releases 24 and 25.

shippable.yml

@@ -21,8 +21,8 @@ matrix:
 
     - env: TEST=linux/centos6/1
     - env: TEST=linux/centos7/1
-    - env: TEST=linux/fedora-rawhide/1
-    - env: TEST=linux/fedora23/1
+    - env: TEST=linux/fedora24/1
+    - env: TEST=linux/fedora25/1
     - env: TEST=linux/opensuseleap/1
     - env: TEST=linux/ubuntu1204/1
     - env: TEST=linux/ubuntu1404/1
@@ -31,8 +31,8 @@ matrix:
 
     - env: TEST=linux/centos6/2
     - env: TEST=linux/centos7/2
-    - env: TEST=linux/fedora-rawhide/2
-    - env: TEST=linux/fedora23/2
+    - env: TEST=linux/fedora24/2
+    - env: TEST=linux/fedora25/2
     - env: TEST=linux/opensuseleap/2
     - env: TEST=linux/ubuntu1204/2
     - env: TEST=linux/ubuntu1404/2
@@ -41,8 +41,8 @@ matrix:
 
     - env: TEST=linux/centos6/3
     - env: TEST=linux/centos7/3
-    - env: TEST=linux/fedora-rawhide/3
-    - env: TEST=linux/fedora23/3
+    - env: TEST=linux/fedora24/3
+    - env: TEST=linux/fedora25/3
     - env: TEST=linux/opensuseleap/3
     - env: TEST=linux/ubuntu1204/3
     - env: TEST=linux/ubuntu1404/3

test/integration/README.md

@@ -132,8 +132,8 @@ Most container images are for testing with Python 2:
 
   - centos6
   - centos7
-  - fedora-rawhide
-  - fedora23
+  - fedora24
+  - fedora25
   - opensuseleap
   - ubuntu1204 (requires `PRIVILEGED=true`)
   - ubuntu1404 (requires `PRIVILEGED=true`)

test/runner/completion/docker.txt

@@ -1,7 +1,7 @@
 centos6
 centos7
-fedora-rawhide
-fedora23
+fedora24
+fedora25
 opensuseleap
 ubuntu1204
 ubuntu1404

test/utils/docker/fedora-rawhide/Dockerfile

@@ -1,67 +0,0 @@
-FROM fedora:rawhide
-
-RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-RUN dnf clean all && \
-    dnf -y --setopt=install_weak_deps=false install \
-    acl \
-    asciidoc \
-    bzip2 \
-    dbus-python \
-    file \
-    findutils \
-    git \
-    glibc-locale-source \
-    iproute \
-    make \
-    mariadb-server \
-    mercurial \
-    MySQL-python \
-    openssh-clients \
-    openssh-server \
-    procps \
-    python2-dnf \
-    python-coverage \
-    python-httplib2 \
-    python-jinja2 \
-    python-keyczar \
-    python-mock \
-    python-nose \
-    python-paramiko \
-    python-passlib \
-    python-pip \
-    python-setuptools \
-    python-virtualenv \
-    PyYAML \
-    rpm-build \
-    rubygems \
-    subversion \
-    sudo \
-    tar \
-    unzip \
-    which \
-    yum \
-    zip \
-    && \
-    dnf clean all
-
-RUN localedef --quiet -c -i en_US -f UTF-8 en_US.UTF-8
-RUN /usr/bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-RUN mkdir /etc/ansible/
-RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-VOLUME /sys/fs/cgroup /run /tmp
-RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key && \
-    ssh-keygen -q -t rsa -N '' -f /etc/ssh/ssh_host_rsa_key && \
-    ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
-    cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \
-    for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
-RUN pip install junit-xml
-ENV container=docker
-CMD ["/usr/sbin/init"]

test/utils/docker/fedora23/Dockerfile

@@ -1,71 +0,0 @@
-FROM fedora:23
-
-RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*; \
-rm -f /etc/systemd/system/*.wants/*; \
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*; \
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-
-RUN dnf clean all && \
-    dnf -y --setopt=install_weak_deps=false install \
-    acl \
-    asciidoc \
-    bzip2 \
-    dbus-python \
-    file \
-    findutils \
-    git \
-    iproute \
-    make \
-    mariadb-server \
-    mercurial \
-    MySQL-python \
-    openssh-clients \
-    openssh-server \
-    procps \
-    python2-dnf \
-    python-coverage \
-    python-httplib2 \
-    python-jinja2 \
-    python-keyczar \
-    python-mock \
-    python-nose \
-    python-paramiko \
-    python-passlib \
-    python-pip \
-    python-setuptools \
-    python-virtualenv \
-    PyYAML \
-    rpm-build \
-    rubygems \
-    subversion \
-    sudo \
-    tar \
-    unzip \
-    which \
-    yum \
-    zip \
-    && \
-    dnf clean all
-
-RUN dnf -y --setopt=install_weak_deps=false reinstall glibc-common && \
-    localedef --quiet -f ISO-8859-1 -i pt_BR pt_BR && \
-    localedef --quiet -f ISO-8859-1 -i es_MX es_MX && \
-    dnf clean all
-
-RUN localedef --quiet -c -i en_US -f UTF-8 en_US.UTF-8
-RUN /usr/bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
-RUN mkdir /etc/ansible/
-RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
-VOLUME /sys/fs/cgroup /run /tmp
-RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key && \
-    ssh-keygen -q -t rsa -N '' -f /etc/ssh/ssh_host_rsa_key && \
-    ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
-    cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \
-    for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
-RUN pip install junit-xml
-ENV container=docker
-CMD ["/usr/sbin/init"]