Browse Source

Convert docker molecule usage to podman

This change updates all uses of docker to podman and removes our docker
installation process from zuul and our local test process.

Change-Id: I17aff14d915801d1fee81a605ef8269f964fab4a
changes/51/752651/7
Gael Chamoulaud (Strider) 7 months ago
parent
commit
aac397560c
No known key found for this signature in database GPG Key ID: 4119D0305C651D66
18 changed files with 61 additions and 24 deletions
  1. +1
    -1
      bindep.txt
  2. +0
    -1
      molecule-requirements.txt
  3. +4
    -0
      scripts/run-local-test
  4. +0
    -8
      tools/test-setup.sh
  5. +4
    -1
      validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml
  6. +4
    -1
      validations_common/roles/check_cpu/molecule/default/molecule.yml
  7. +4
    -1
      validations_common/roles/check_disk_space/molecule/default/molecule.yml
  8. +4
    -1
      validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml
  9. +4
    -1
      validations_common/roles/check_ram/molecule/default/molecule.yml
  10. +4
    -1
      validations_common/roles/check_selinux_mode/molecule/default/molecule.yml
  11. +4
    -1
      validations_common/roles/dns/molecule/default/molecule.yml
  12. +4
    -1
      validations_common/roles/haproxy/molecule/default/molecule.yml
  13. +4
    -1
      validations_common/roles/ntp/molecule/default/molecule.yml
  14. +4
    -1
      validations_common/roles/service_status/molecule/default/molecule.yml
  15. +4
    -1
      validations_common/roles/service_status/molecule/podman/molecule.yml
  16. +4
    -1
      validations_common/roles/service_status/molecule/systemd/molecule.yml
  17. +4
    -1
      validations_common/roles/validate_selinux/molecule/default/molecule.yml
  18. +4
    -1
      validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml

+ 1
- 1
bindep.txt View File

@ -24,7 +24,7 @@ libxml2-devel [platform:rpm]
libxslt-devel [platform:rpm]
libxslt1-dev [platform:dpkg]
libxslt-dev [platform:apk]
podman [platform:rpm]
python-devel [platform:rpm !platform:rhel-8 !platform:centos-8]
python3-devel [platform:rpm !platform:rhel-7 !platform:centos-7]
PyYAML [platform:rpm !platform:rhel-8 !platform:centos-8]


+ 0
- 1
molecule-requirements.txt View File

@ -1,7 +1,6 @@
# this is required for the molecule jobs
ansible
ansi2html
docker
# https://github.com/sqlalchemy/dogpile.cache/issues/178
dogpile.cache>=0.6.5,<0.9.1 # MIT
pytest


+ 4
- 0
scripts/run-local-test View File

@ -40,6 +40,10 @@ case "${ID,,}" in
;;
esac
# Ensure the required ci file is present
sudo mkdir -p /etc/ci
sudo touch /etc/ci/mirror_info.sh
# Create a virtual env
"${PYTHON_EXEC}" -m virtualenv --system-site-packages "${HOME}/test-python"


+ 0
- 8
tools/test-setup.sh View File

@ -1,8 +0,0 @@
#!/bin/bash
set -euxo pipefail
# Used by Zuul CI to perform extra bootstrapping
# Workaround for a potential:
# Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock
# See https://docs.docker.com/install/linux/linux-postinstall/
newgrp docker || true

+ 4
- 1
validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools python*-PyYAML
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/check_cpu/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/check_disk_space/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools python*-PyYAML
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/check_ram/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/check_selinux_mode/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools ruby python*-PyYAML
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/dns/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/haproxy/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools haproxy python*-PyYAML
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/ntp/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools python*-enum34 ruby python*-PyYAML
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/service_status/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -17,6 +17,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -27,6 +29,7 @@ platforms:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/service_status/molecule/podman/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -17,6 +17,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -27,6 +29,7 @@ platforms:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/service_status/molecule/systemd/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -16,6 +16,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -26,6 +28,7 @@ platforms:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/validate_selinux/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -15,6 +15,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -23,6 +25,7 @@ platforms:
pkg_extras: python*-setuptools
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


+ 4
- 1
validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml View File

@ -1,6 +1,6 @@
---
driver:
name: docker
name: podman
log: true
@ -16,6 +16,8 @@ platforms:
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
ulimits: &ulimit
- host
- name: centos8
hostname: centos8
@ -25,6 +27,7 @@ platforms:
pkg_extras: python*-setuptools
environment:
<<: *env
ulimits: *ulimit
provisioner:
name: ansible


Loading…
Cancel
Save