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
This commit is contained in:
parent
d633131d60
commit
aac397560c
|
@ -24,7 +24,7 @@ libxml2-devel [platform:rpm]
|
||||||
libxslt-devel [platform:rpm]
|
libxslt-devel [platform:rpm]
|
||||||
libxslt1-dev [platform:dpkg]
|
libxslt1-dev [platform:dpkg]
|
||||||
libxslt-dev [platform:apk]
|
libxslt-dev [platform:apk]
|
||||||
|
podman [platform:rpm]
|
||||||
python-devel [platform:rpm !platform:rhel-8 !platform:centos-8]
|
python-devel [platform:rpm !platform:rhel-8 !platform:centos-8]
|
||||||
python3-devel [platform:rpm !platform:rhel-7 !platform:centos-7]
|
python3-devel [platform:rpm !platform:rhel-7 !platform:centos-7]
|
||||||
PyYAML [platform:rpm !platform:rhel-8 !platform:centos-8]
|
PyYAML [platform:rpm !platform:rhel-8 !platform:centos-8]
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# this is required for the molecule jobs
|
# this is required for the molecule jobs
|
||||||
ansible
|
ansible
|
||||||
ansi2html
|
ansi2html
|
||||||
docker
|
|
||||||
# https://github.com/sqlalchemy/dogpile.cache/issues/178
|
# https://github.com/sqlalchemy/dogpile.cache/issues/178
|
||||||
dogpile.cache>=0.6.5,<0.9.1 # MIT
|
dogpile.cache>=0.6.5,<0.9.1 # MIT
|
||||||
pytest
|
pytest
|
||||||
|
|
|
@ -40,6 +40,10 @@ case "${ID,,}" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# Ensure the required ci file is present
|
||||||
|
sudo mkdir -p /etc/ci
|
||||||
|
sudo touch /etc/ci/mirror_info.sh
|
||||||
|
|
||||||
# Create a virtual env
|
# Create a virtual env
|
||||||
"${PYTHON_EXEC}" -m virtualenv --system-site-packages "${HOME}/test-python"
|
"${PYTHON_EXEC}" -m virtualenv --system-site-packages "${HOME}/test-python"
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools python*-PyYAML
|
pkg_extras: python*-setuptools python*-PyYAML
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools
|
pkg_extras: python*-setuptools
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools
|
pkg_extras: python*-setuptools
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools python*-PyYAML
|
pkg_extras: python*-setuptools python*-PyYAML
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools
|
pkg_extras: python*-setuptools
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools ruby python*-PyYAML
|
pkg_extras: python*-setuptools ruby python*-PyYAML
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools
|
pkg_extras: python*-setuptools
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools haproxy python*-PyYAML
|
pkg_extras: python*-setuptools haproxy python*-PyYAML
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools python*-enum34 ruby python*-PyYAML
|
pkg_extras: python*-setuptools python*-enum34 ruby python*-PyYAML
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -17,6 +17,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -27,6 +29,7 @@ platforms:
|
||||||
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -17,6 +17,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -27,6 +29,7 @@ platforms:
|
||||||
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -16,6 +16,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -26,6 +28,7 @@ platforms:
|
||||||
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -15,6 +15,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -23,6 +25,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools
|
pkg_extras: python*-setuptools
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
driver:
|
driver:
|
||||||
name: docker
|
name: podman
|
||||||
|
|
||||||
log: true
|
log: true
|
||||||
|
|
||||||
|
@ -16,6 +16,8 @@ platforms:
|
||||||
environment: &env
|
environment: &env
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
ulimits: &ulimit
|
||||||
|
- host
|
||||||
|
|
||||||
- name: centos8
|
- name: centos8
|
||||||
hostname: centos8
|
hostname: centos8
|
||||||
|
@ -25,6 +27,7 @@ platforms:
|
||||||
pkg_extras: python*-setuptools
|
pkg_extras: python*-setuptools
|
||||||
environment:
|
environment:
|
||||||
<<: *env
|
<<: *env
|
||||||
|
ulimits: *ulimit
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible
|
name: ansible
|
||||||
|
|
Loading…
Reference in New Issue