Merge "Convert docker molecule usage to podman"

This commit is contained in:
Zuul 2020-10-05 11:30:54 +00:00 committed by Gerrit Code Review
commit e4b814f9dc
18 changed files with 61 additions and 24 deletions

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]

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

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"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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