cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Docker image updates for integration tests. (#26054)

Browse source 
* Sort packages to install.
* Add python-argparse to centos6 docker image.
* Add gcc and python dev lib to docker images.
* Add python cryptography to docker images.
* Add coverage using pip instead of OS packages.
* Update old pip versions in docker images.
* Exclude */pyshared/* from coverage reporting.
This commit is contained in:
Matt Clay 2017-06-23 12:45:38 -07:00 committed by GitHub
parent 3e52f47b51
commit 4530eea7f8
11 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.coveragerc
View file

@ -21,4 +21,5 @@ omit =
*/python*/dist-packages/* */python*/dist-packages/*
*/python*/site-packages/* */python*/site-packages/*
*/python*/distutils/* */python*/distutils/*
*/pyshared/*
*/pytest */pytest

4
test/utils/docker/centos6/Dockerfile
View file

@ -19,7 +19,7 @@ RUN yum clean all && \
openssh-clients \ openssh-clients \
openssh-server \ openssh-server \
openssl-devel \ openssl-devel \
python-coverage \ python-argparse \
python-devel \ python-devel \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
@ -56,6 +56,6 @@ RUN ssh-keygen -q -t rsa1 -N '' -f /etc/ssh/ssh_host_key && \
ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \ ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \ 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 for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
RUN pip install junit-xml RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/sbin/init"] CMD ["/sbin/init"]

4
test/utils/docker/centos7/Dockerfile
View file

@ -29,7 +29,7 @@ RUN yum clean all && \
openssh-clients \ openssh-clients \
openssh-server \ openssh-server \
openssl-devel \ openssl-devel \
python-coverage \ python-cryptography \
python-devel \ python-devel \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
@ -63,6 +63,6 @@ RUN ssh-keygen -q -t rsa1 -N '' -f /etc/ssh/ssh_host_key && \
ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \ ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \ 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 for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
RUN pip install junit-xml RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/usr/sbin/init"] CMD ["/usr/sbin/init"]

6
test/utils/docker/fedora24/Dockerfile
View file

@ -35,8 +35,7 @@ RUN dnf clean all && \
openssh-server \ openssh-server \
openssl-devel \ openssl-devel \
procps \ procps \
python2-dnf \ python-cryptography \
python-coverage \
python-devel \ python-devel \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
@ -49,6 +48,7 @@ RUN dnf clean all && \
python-pip \ python-pip \
python-setuptools \ python-setuptools \
python-virtualenv \ python-virtualenv \
python2-dnf \
PyYAML \ PyYAML \
rpm-build \ rpm-build \
rubygems \ rubygems \
@ -72,6 +72,6 @@ RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key && \
ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \ ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \ 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 for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
RUN pip install junit-xml RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/usr/sbin/init"] CMD ["/usr/sbin/init"]

8
test/utils/docker/fedora25/Dockerfile
View file

@ -17,6 +17,7 @@ RUN dnf clean all && \
dbus-python \ dbus-python \
file \ file \
findutils \ findutils \
gcc \
git \ git \
glibc-locale-source \ glibc-locale-source \
iproute \ iproute \
@ -30,8 +31,8 @@ RUN dnf clean all && \
openssh-server \ openssh-server \
openssl-devel \ openssl-devel \
procps \ procps \
python2-dnf \ python-cryptography \
python-coverage \ python-devel \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
python-keyczar \ python-keyczar \
@ -43,6 +44,7 @@ RUN dnf clean all && \
python-pip \ python-pip \
python-setuptools \ python-setuptools \
python-virtualenv \ python-virtualenv \
python2-dnf \
PyYAML \ PyYAML \
rpm-build \ rpm-build \
rubygems \ rubygems \
@ -66,6 +68,6 @@ RUN ssh-keygen -q -t dsa -N '' -f /etc/ssh/ssh_host_dsa_key && \
ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \ ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \ 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 for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
RUN pip install junit-xml RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/usr/sbin/init"] CMD ["/usr/sbin/init"]

3
test/utils/docker/opensuse42.1/Dockerfile
View file

@ -20,7 +20,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
mercurial \ mercurial \
openssh \ openssh \
postgresql-server \ postgresql-server \
python-coverage \
python-cryptography \ python-cryptography \
python-devel \ python-devel \
python-httplib2 \ python-httplib2 \
@ -72,6 +71,6 @@ RUN ssh-keygen -q -t rsa1 -N '' -f /etc/ssh/ssh_host_key && \
for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
# explicitly enable the service, opensuse default to disabled services # explicitly enable the service, opensuse default to disabled services
RUN systemctl enable sshd.service RUN systemctl enable sshd.service
RUN pip install junit-xml RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/sbin/init"] CMD ["/sbin/init"]

4
test/utils/docker/opensuse42.2/Dockerfile
View file

@ -20,8 +20,8 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
mercurial \ mercurial \
openssh \ openssh \
postgresql-server \ postgresql-server \
python-coverage \
python-cryptography \ python-cryptography \
python-devel \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
python-keyczar \ python-keyczar \
@ -71,6 +71,6 @@ RUN ssh-keygen -q -t rsa1 -N '' -f /etc/ssh/ssh_host_key && \
for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
# explicitly enable the service, opensuse default to disabled services # explicitly enable the service, opensuse default to disabled services
RUN systemctl enable sshd.service RUN systemctl enable sshd.service
RUN pip install junit-xml RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/sbin/init"] CMD ["/sbin/init"]

5
test/utils/docker/ubuntu1204/Dockerfile
View file

@ -26,7 +26,6 @@ RUN apt-get update -y && \
mysql-server \ mysql-server \
openssh-client \ openssh-client \
openssh-server \ openssh-server \
python-coverage \
python-dev \ python-dev \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
@ -55,6 +54,7 @@ RUN apt-get update -y && \
apt-get clean apt-get clean
RUN pip install --upgrade pycrypto cryptography RUN pip install --upgrade pycrypto cryptography
# helpful things taken from the ubuntu-upstart Dockerfile: # helpful things taken from the ubuntu-upstart Dockerfile:
# https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile # https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile
ADD init-fake.conf /etc/init/fake-container-events.conf ADD init-fake.conf /etc/init/fake-container-events.conf
@ -91,6 +91,7 @@ RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \ 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 for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
VOLUME /sys/fs/cgroup /run/lock /run /tmp VOLUME /sys/fs/cgroup /run/lock /run /tmp
RUN pip install junit-xml RUN pip install pip --upgrade
RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/sbin/init"] CMD ["/sbin/init"]

8
test/utils/docker/ubuntu1404/Dockerfile
View file

@ -15,6 +15,7 @@ RUN apt-get update -y && \
dpkg-dev \ dpkg-dev \
fakeroot \ fakeroot \
gawk \ gawk \
gcc \
git \ git \
libffi-dev \ libffi-dev \
libssl-dev \ libssl-dev \
@ -25,7 +26,7 @@ RUN apt-get update -y && \
mysql-server \ mysql-server \
openssh-client \ openssh-client \
openssh-server \ openssh-server \
python-coverage \ python-dev \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
python-keyczar \ python-keyczar \
@ -51,6 +52,8 @@ RUN apt-get update -y && \
&& \ && \
apt-get clean apt-get clean
RUN pip install --upgrade pycrypto cryptography
# helpful things taken from the ubuntu-upstart Dockerfile: # helpful things taken from the ubuntu-upstart Dockerfile:
# https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile # https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile
ADD init-fake.conf /etc/init/fake-container-events.conf ADD init-fake.conf /etc/init/fake-container-events.conf
@ -87,6 +90,7 @@ RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \ 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 for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
VOLUME /sys/fs/cgroup /run/lock /run /tmp VOLUME /sys/fs/cgroup /run/lock /run /tmp
RUN pip install junit-xml RUN pip install pip --upgrade
RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/sbin/init"] CMD ["/sbin/init"]

6
test/utils/docker/ubuntu1604/Dockerfile
View file

@ -15,6 +15,7 @@ RUN apt-get update -y && \
dpkg-dev \ dpkg-dev \
fakeroot \ fakeroot \
gawk \ gawk \
gcc \
git \ git \
iproute2 \ iproute2 \
libffi-dev \ libffi-dev \
@ -27,7 +28,8 @@ RUN apt-get update -y && \
mysql-server \ mysql-server \
openssh-client \ openssh-client \
openssh-server \ openssh-server \
python-coverage \ python-cryptography \
python-dev \
python-dbus \ python-dbus \
python-httplib2 \ python-httplib2 \
python-jinja2 \ python-jinja2 \
@ -64,6 +66,6 @@ RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \ 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 for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
VOLUME /sys/fs/cgroup /run/lock /run /tmp VOLUME /sys/fs/cgroup /run/lock /run /tmp
RUN pip install junit-xml RUN pip install coverage junit-xml
ENV container=docker ENV container=docker
CMD ["/sbin/init"] CMD ["/sbin/init"]

6
test/utils/docker/ubuntu1604py3/Dockerfile
View file

@ -13,6 +13,7 @@ RUN apt-get update -y && \
dpkg-dev \ dpkg-dev \
fakeroot \ fakeroot \
gawk \ gawk \
gcc \
git \ git \
iproute2 \ iproute2 \
libffi-dev \ libffi-dev \
@ -24,7 +25,8 @@ RUN apt-get update -y && \
mysql-server \ mysql-server \
openssh-client \ openssh-client \
openssh-server \ openssh-server \
python3-coverage \ python3-cryptography \
python3-dev \
python3-dbus \ python3-dbus \
python3-httplib2 \ python3-httplib2 \
python3-jinja2 \ python3-jinja2 \
@ -60,6 +62,6 @@ RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \ 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 for key in /etc/ssh/ssh_host_*_key.pub; do echo "localhost $(cat ${key})" >> /root/.ssh/known_hosts; done
VOLUME /sys/fs/cgroup /run/lock /run /tmp VOLUME /sys/fs/cgroup /run/lock /run /tmp
RUN pip3 install junit-xml python3-keyczar RUN pip3 install coverage junit-xml python3-keyczar
ENV container=docker ENV container=docker
CMD ["/sbin/init"] CMD ["/sbin/init"]