From 8cfc47bb7ab69d729fc6dea1056e7d07a3846d0a Mon Sep 17 00:00:00 2001 From: Sergei Antipov Date: Fri, 13 Jul 2018 18:50:23 -0400 Subject: [PATCH] Ubuntu 18.04 support --- .travis.yml | 5 +++++ README.md | 1 + tasks/install.debian.yml | 8 +++++++- tests/Dockerfile.ubuntu_18_04-builded | 29 +++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 tests/Dockerfile.ubuntu_18_04-builded diff --git a/.travis.yml b/.travis.yml index b24fd1f..61a4cbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,11 @@ language: python python: - "2.7" env: + - > + DISTRIBUTION=ubuntu + DIST_VERSION=18_04-builded + MONGODB_VERSION=3.6 + MONGODB_PACKAGE=mongodb - > DISTRIBUTION=ubuntu DIST_VERSION=16_04-builded diff --git a/README.md b/README.md index c32efa4..3c20465 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ MongoDB support matrix: | ------------ |:-------------:|:-----------:|:-----------:|:-----------:| | Ubuntu 14.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| | Ubuntu 16.04 | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| +| Ubuntu 18.04 | :no_entry: | :x:| :x:| :white_check_mark:| | Debian 8.x | :no_entry: | :white_check_mark:| :white_check_mark:| :white_check_mark:| | Debian 9.x | :no_entry: | :white_check_mark:| :x:| :white_check_mark:| | RHEL 6.x | :no_entry: | :white_check_mark: | :white_check_mark: | :white_check_mark:| diff --git a/tasks/install.debian.yml b/tasks/install.debian.yml index 96e8b83..c91baed 100644 --- a/tasks/install.debian.yml +++ b/tasks/install.debian.yml @@ -23,7 +23,13 @@ when: (mongodb_package == 'mongodb-org' and (mongodb_version is not defined or mongodb_repository[mongodb_major_version] is not defined - or mongodb_version != "3.6") and ansible_distribution_release == "stretch") + or mongodb_version != '3.6') and ansible_distribution_release == 'stretch') + +- name: Fail when used wrong mongodb_version variable with Debian Stretch + fail: + msg: "mongodb_version variable should be '3.6' and mongodb_package should be 'mongodb' for Ubuntu 18.04" + when: ((mongodb_package == 'mongodb-org' or mongodb_version != '3.6') + and ansible_distribution_release == "bionic") - name: Fail when used wrong mongodb_version variable fail: diff --git a/tests/Dockerfile.ubuntu_18_04-builded b/tests/Dockerfile.ubuntu_18_04-builded new file mode 100644 index 0000000..467715d --- /dev/null +++ b/tests/Dockerfile.ubuntu_18_04-builded @@ -0,0 +1,29 @@ +FROM ubuntu:18.04 + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt update && \ + apt install --yes python-minimal systemd gnupg + +RUN cd /lib/systemd/system/sysinit.target.wants/ && \ + ls | grep -v systemd-tmpfiles-setup.service | xargs rm -f && \ + rm -f /lib/systemd/system/sockets.target.wants/*udev* && \ + systemctl mask -- \ + tmp.mount \ + etc-hostname.mount \ + etc-hosts.mount \ + etc-resolv.conf.mount \ + -.mount \ + swap.target \ + getty.target \ + getty-static.service \ + dev-mqueue.mount \ + cgproxy.service \ + systemd-tmpfiles-setup-dev.service \ + systemd-remount-fs.service \ + systemd-ask-password-wall.path \ + systemd-logind.service && \ + systemctl set-default multi-user.target || true + +RUN sed -ri /etc/systemd/journald.conf \ + -e 's!^#?Storage=.*!Storage=volatile!'