Merge branch 'release/4.3.0'

.travis.yml

@@ -17,7 +17,6 @@ env:
 
 jobs:
   allow_failures:
-    - env: MOLECULE_SCENARIO_NAME="ubuntu-20.04"
     - env: MOLECULE_SCENARIO_NAME="ubuntu-19.10"
     - env: MOLECULE_SCENARIO_NAME="centos-8"
     - env: MOLECULE_SCENARIO_NAME="centos-7"

defaults/main.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Podman version.
-podman_version: "v1.8.2"
+podman_version: "v1.9.0"
 
 # Podman download details.
 podman_download: "{{ _podman_download[podman_version] }}"

molecule/default/Dockerfile.j2

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG   "en_US.utf8"
 ENV LC_ALL "en_US.utf8"

molecule/default/molecule.yml

@@ -24,7 +24,7 @@ platforms:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     entrypoint: init
     command: "bash -c 'sleep infinity'"
-    tty: True
+    tty: true
     env:
       container: docker
 lint: |

molecule/ubuntu-20.04/molecule.yml

@@ -15,18 +15,23 @@
 # limitations under the License.
 
 driver:
-  name: docker
+  name: vagrant
+  provider:
+    name: libvirt
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
-    dockerfile: Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    entrypoint: init
-    command: "bash -c 'sleep infinity'"
-    tty: True
-    env:
-      container: docker
+    box: abi/ubuntu2004
+    cpu: 2
+    memory: 2048
+    interfaces:
+      - auto_config: true
+        network_name: private_network
+        type: dhcp
+    provider_raw_config_args:
+      - 'nic_model_type = "virtio"'
+      - 'disk_bus = "virtio"'
+      - 'volume_cache = "none"'
+      - 'storage :file, bus: "virtio", cache: "none"'
 lint: |
   set -ex
   yamllint .

tasks/redhat.yml

@@ -17,8 +17,8 @@
 - name: yum install
   yum:
     name: "{{ item.name }}"
+    state: "{{ item.state }}"
     enablerepo: "{{ item.enablerepo | default(None) or omit }}"
-    state: "{{ item.state | default(None) or omit }}"
   loop: "{{ _yum }}"
   register: result
   until: result is succeeded

vars/main.yml

@@ -15,6 +15,10 @@
 # limitations under the License.
 
 _podman_download:
+  v1.9.0:
+    url: "https://github.com/containers/libpod/archive/v1.9.0.tar.gz"
+    dest: "{{ ansible_user_dir }}/.ansible/tmp/libpod-v1.9.0.tar.gz"
+    checksum: "sha1:87fd7a347e043713018055ffdef7324eb5da1feb"
   v1.8.2:
     url: "https://github.com/containers/libpod/archive/v1.8.2.tar.gz"
     dest: "{{ ansible_user_dir }}/.ansible/tmp/libpod-v1.8.2.tar.gz"