From 68346b128fc1a27825971267cfd051e396040f2b Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 3 Jan 2017 10:45:53 -0800 Subject: [PATCH] Update Fedora tests to use releases 24 and 25. --- shippable.yml | 12 ++-- test/integration/README.md | 4 +- test/runner/completion/docker.txt | 4 +- test/utils/docker/fedora-rawhide/Dockerfile | 67 ------------------- test/utils/docker/fedora23/Dockerfile | 71 --------------------- 5 files changed, 10 insertions(+), 148 deletions(-) delete mode 100644 test/utils/docker/fedora-rawhide/Dockerfile delete mode 100644 test/utils/docker/fedora23/Dockerfile diff --git a/shippable.yml b/shippable.yml index f14f454177d..4898751ee25 100644 --- a/shippable.yml +++ b/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 diff --git a/test/integration/README.md b/test/integration/README.md index bd41f0e2faf..74deaade2fd 100644 --- a/test/integration/README.md +++ b/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`) diff --git a/test/runner/completion/docker.txt b/test/runner/completion/docker.txt index 92852955b89..88099782357 100644 --- a/test/runner/completion/docker.txt +++ b/test/runner/completion/docker.txt @@ -1,7 +1,7 @@ centos6 centos7 -fedora-rawhide -fedora23 +fedora24 +fedora25 opensuseleap ubuntu1204 ubuntu1404 diff --git a/test/utils/docker/fedora-rawhide/Dockerfile b/test/utils/docker/fedora-rawhide/Dockerfile deleted file mode 100644 index dd12e781612..00000000000 --- a/test/utils/docker/fedora-rawhide/Dockerfile +++ /dev/null @@ -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"] diff --git a/test/utils/docker/fedora23/Dockerfile b/test/utils/docker/fedora23/Dockerfile deleted file mode 100644 index 668c5fb3766..00000000000 --- a/test/utils/docker/fedora23/Dockerfile +++ /dev/null @@ -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"]