From e4920b0da41aaf37880dfd2bfbc75a4db1bb8217 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 10 May 2021 13:17:39 +0100 Subject: [PATCH] Support ubuntu-20 (#745) --- .kitchen.yml | 11 +++++++++++ README.md | 1 + test/matrix-6x.yml | 1 + test/matrix.yml | 1 + 4 files changed, 14 insertions(+) diff --git a/.kitchen.yml b/.kitchen.yml index 68aaebf..7de39cd 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -66,6 +66,17 @@ platforms: - <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json - /etc # This fixes certain java file actions that check the mount point. Without this adding users fails for some docker storage drivers run_command: "/sbin/init" + - name: ubuntu-20.04 + driver_config: + image: ubuntu:20.04 + privileged: true + provision_command: + - apt-get update -q && apt-get install -y -q ansible gpg iproute2 python3-jmespath + use_sudo: false + volume: + - <%=ENV['ES_XPACK_LICENSE_FILE']%>:/tmp/license.json + - /etc # This fixes certain java file actions that check the mount point. Without this adding users fails for some docker storage drivers + run_command: "/sbin/init" - name: debian-8 driver_config: image: debian:8 diff --git a/README.md b/README.md index cf0381f..33a3a2d 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Ansible role for 7.x/6.x Elasticsearch. Currently this works on Debian and RedH * Ubuntu 14.04 * Ubuntu 16.04 * Ubuntu 18.04 +* Ubuntu 20.04 * Debian 8 * Debian 9 * Debian 10 diff --git a/test/matrix-6x.yml b/test/matrix-6x.yml index d08e1e6..94aaead 100644 --- a/test/matrix-6x.yml +++ b/test/matrix-6x.yml @@ -2,6 +2,7 @@ OS: - ubuntu-1404 - ubuntu-1604 - ubuntu-1804 + - ubuntu-2004 - debian-8 - debian-9 - debian-10 diff --git a/test/matrix.yml b/test/matrix.yml index 0ea5ac5..19f303d 100644 --- a/test/matrix.yml +++ b/test/matrix.yml @@ -2,6 +2,7 @@ OS: - ubuntu-1404 - ubuntu-1604 - ubuntu-1804 + - ubuntu-2004 - debian-8 - debian-9 - debian-10