openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "fix all tripleo_container_* molecule jobs on centos8"

This commit is contained in:
Zuul 2020-03-17 22:34:23 +00:00 committed by Gerrit Code Review
parent 0701687ba6 6af37d7a44
commit 2ba47dd457
6 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_ansible/ansible_plugins/modules/podman_container.py
View File

@ -1524,6 +1524,7 @@ class PodmanContainerDiff:
strip_from_name = [ strip_from_name = [
"docker.io/library/", "docker.io/library/",
"docker.io/", "docker.io/",
"registry.fedoraproject.org/",
":latest", ":latest",
] ]
for repl in strip_from_name: for repl in strip_from_name:

2
tripleo_ansible/roles/tripleo_container_rm/molecule/legacy_vars/prepare.yml
View File

@ -35,7 +35,7 @@
command: "podman pull centos:8" command: "podman pull centos:8"
- name: Create test containers - name: Create test containers
command: "podman run -itd --systemd --name {{ item }} fedora bash" command: "podman run -itd --systemd true --name {{ item }} fedora bash"
with_items: with_items:
- podman-legacy-container1 - podman-legacy-container1
- podman-legacy-container2 - podman-legacy-container2

2
tripleo_ansible/roles/tripleo_container_rm/molecule/podman-rm-stopped/prepare.yml
View File

@ -35,7 +35,7 @@
command: "podman pull centos:8" command: "podman pull centos:8"
- name: Create test containers - name: Create test containers
command: "podman run -itd --systemd --name {{ item }} fedora bash" command: "podman run -itd --systemd true --name {{ item }} fedora bash"
with_items: with_items:
- podman-container1 - podman-container1
- podman-container2 - podman-container2

2
tripleo_ansible/roles/tripleo_container_rm/molecule/podman/prepare.yml
View File

@ -35,7 +35,7 @@
command: "podman pull centos:8" command: "podman pull centos:8"
- name: Create test containers - name: Create test containers
command: "podman run -itd --systemd --name {{ item }} fedora bash" command: "podman run -itd --systemd true --name {{ item }} fedora bash"
with_items: with_items:
- podman-container1 - podman-container1
- podman-container2 - podman-container2

2
tripleo_ansible/roles/tripleo_container_stop/molecule/podman/prepare.yml
View File

@ -35,7 +35,7 @@
command: "podman pull centos:8" command: "podman pull centos:8"
- name: Create test containers - name: Create test containers
command: "podman run -itd --systemd --name {{ item }} fedora bash" command: "podman run -itd --systemd true --name {{ item }} fedora bash"
with_items: with_items:
- podman-container1 - podman-container1
- podman-container2 - podman-container2

3
zuul.d/molecule.yaml
View File

@ -236,7 +236,6 @@
parent: tripleo-ansible-centos-8-base parent: tripleo-ansible-centos-8-base
vars: vars:
tripleo_role_name: tripleo_container_manage tripleo_role_name: tripleo_container_manage
voting: false
- job: - job:
files: files:
- ^tripleo_ansible/roles/tripleo_container_rm/.* - ^tripleo_ansible/roles/tripleo_container_rm/.*
@ -244,7 +243,6 @@
parent: tripleo-ansible-centos-8-base parent: tripleo-ansible-centos-8-base
vars: vars:
tripleo_role_name: tripleo_container_rm tripleo_role_name: tripleo_container_rm
voting: false
- job: - job:
files: files:
- ^tripleo_ansible/roles/tripleo_container_stop/.* - ^tripleo_ansible/roles/tripleo_container_stop/.*
@ -252,7 +250,6 @@
parent: tripleo-ansible-centos-8-base parent: tripleo-ansible-centos-8-base
vars: vars:
tripleo_role_name: tripleo_container_stop tripleo_role_name: tripleo_container_stop
voting: false
- job: - job:
files: files:
- ^tripleo_ansible/roles/tripleo_container_tag/.* - ^tripleo_ansible/roles/tripleo_container_tag/.*