diff --git a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml index f8c3d9bf8..e1eec84b8 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg diff --git a/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml index f8c3d9bf8..e1eec84b8 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/molecule/legacy_vars/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml index 9db1a9ef8..1f1c3ffa4 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/molecule.yml @@ -16,8 +16,6 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" command: /sbin/init - capabilities: - - ALL volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro @@ -36,8 +34,6 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" command: /sbin/init - capabilities: - - ALL volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro diff --git a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml index e563a032f..ff5763060 100644 --- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/molecule.yml @@ -16,8 +16,6 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro privileged: true @@ -33,8 +31,6 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro privileged: true diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml index 6731e3b9d..3490ad9ba 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /dev:/dev - /lib/modules:/lib/modules diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml index 6731e3b9d..3490ad9ba 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /dev:/dev - /lib/modules:/lib/modules diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml index 36c4fc23f..7b770ddc1 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /dev:/dev - /lib/modules:/lib/modules diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml index fe145c374..76405b94c 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml @@ -17,8 +17,6 @@ platforms: /bin/mkdir -p /var/run/dbus && /usr/bin/dbus-uuidgen > /var/lib/dbus/machine-id && /usr/bin/dbus-daemon --config-file=/usr/share/dbus-1/system.conf - capabilities: - - ALL volumes: - /dev:/dev - /lib/modules:/lib/modules diff --git a/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml index 9a0e13cc8..be2135168 100644 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools cronie rsyslog command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml index fb311b7d7..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml @@ -12,8 +12,6 @@ platforms: url: registry.access.redhat.com dockerfile: Dockerfile pkg_extras: python*setuptools - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg diff --git a/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml index fb311b7d7..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml @@ -12,8 +12,6 @@ platforms: url: registry.access.redhat.com dockerfile: Dockerfile pkg_extras: python*setuptools - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg diff --git a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml index 8866728c5..d6a52a87a 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg diff --git a/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml index 8866728c5..d6a52a87a 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg diff --git a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml index 1eace9c79..2f2f72a31 100644 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro diff --git a/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml index 1eace9c79..2f2f72a31 100644 --- a/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro diff --git a/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml index a70252dca..604e2d1dc 100644 --- a/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml @@ -13,8 +13,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro @@ -35,8 +33,6 @@ platforms: dockerfile: Dockerfile pkg_extras: python*setuptools command: /sbin/init - capabilities: - - ALL volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro diff --git a/tripleo_ansible/roles/tripleo_update_trusted_cas/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_update_trusted_cas/molecule/default/molecule.yml index 0c8cb80f6..5850a0261 100644 --- a/tripleo_ansible/roles/tripleo_update_trusted_cas/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_update_trusted_cas/molecule/default/molecule.yml @@ -16,8 +16,6 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro privileged: true @@ -33,8 +31,6 @@ platforms: http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" command: /sbin/init - capabilities: - - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro privileged: true diff --git a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml index c08c90e8d..d14d7ecbd 100644 --- a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml @@ -12,8 +12,6 @@ platforms: url: registry.access.redhat.com dockerfile: Dockerfile pkg_extras: python*setuptools - capabilities: - - ALL volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro diff --git a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml index 003c331fd..673e06cf5 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml @@ -12,8 +12,6 @@ platforms: url: registry.access.redhat.com dockerfile: Dockerfile pkg_extras: python*setuptools - capabilities: - - ALL volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml index 09e6e3e81..7c813e434 100644 --- a/zuul.d/playbooks/pre.yml +++ b/zuul.d/playbooks/pre.yml @@ -15,6 +15,17 @@ include_role: name: ensure-pip + # https://github.com/containers/podman/issues/8965 + # podman rootless systemd is broken in 2.0.5, so we use 1.6.4 + - name: Pin container-tools + become: true + shell: | + dnf module disable container-tools:rhel8 -y + dnf module enable container-tools:2.0 -y + when: + - (ansible_os_family | lower) == "redhat" + - (ansible_distribution_major_version | int) >= 8 + - name: Setup bindep pip: name: "bindep"