From a89c63ba16a186a3888bd4e715a63f22da040549 Mon Sep 17 00:00:00 2001 From: "Gael Chamoulaud (Strider)" Date: Thu, 24 Sep 2020 15:19:29 +0200 Subject: [PATCH] Use the UBI8 image for testing This change converts our use of CentOS7/88 to UBI8, which should provide a better test environment which will match that of production for future releases of TripleO. While this image change will better match production clouds thanks in large part to TCIB, it will also remove our use of docker.io (dockerhub) which fraught with peril due to the ongoing API rate limits saga. Change-Id: Ide53bef507b02b35581f596443c8a8dfa5bc7083 --- playbooks/molecule/pre.yml | 7 +++ .../molecule/default/molecule.yml | 32 +++++----- .../check_cpu/molecule/default/molecule.yml | 32 +++++----- .../molecule/default/molecule.yml | 32 +++++----- .../molecule/default/molecule.yml | 32 +++++----- .../check_ram/molecule/default/molecule.yml | 32 +++++----- .../molecule/default/molecule.yml | 33 ++++++----- .../roles/dns/molecule/default/molecule.yml | 32 +++++----- .../haproxy/molecule/default/molecule.yml | 32 +++++----- .../roles/ntp/molecule/default/molecule.yml | 32 +++++----- .../molecule/default/molecule.yml | 35 ++++++----- .../molecule/docker/molecule.yml | 37 +++++------- .../molecule/docker/playbook.yml | 59 ------------------- .../molecule/podman/molecule.yml | 34 +++++------ .../molecule/podman/playbook.yml | 46 --------------- .../molecule/default/molecule.yml | 32 +++++----- .../molecule/default/molecule.yml | 33 ++++++----- 17 files changed, 244 insertions(+), 328 deletions(-) delete mode 100644 validations_common/roles/service_status/molecule/docker/playbook.yml delete mode 100644 validations_common/roles/service_status/molecule/podman/playbook.yml diff --git a/playbooks/molecule/pre.yml b/playbooks/molecule/pre.yml index 2721d4c..4c69712 100644 --- a/playbooks/molecule/pre.yml +++ b/playbooks/molecule/pre.yml @@ -76,6 +76,13 @@ * hard nproc 4096 dest: /etc/security/limits.d/containers.conf + - name: Copy repos directory to opt workspace + copy: + src: /etc/yum.repos.d + dest: /opt/ + remote_src: true + mode: "0777" + - name: Reset ssh connection meta: reset_connection roles: diff --git a/validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml b/validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml index aa3d554..e688be1 100644 --- a/validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml +++ b/validations_common/roles/advanced_format_512e_support/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools PyYAML - easy_install: - - pip + pkg_extras: python*setuptools python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools python*-PyYAML - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/check_cpu/molecule/default/molecule.yml b/validations_common/roles/check_cpu/molecule/default/molecule.yml index e84978a..bcb4e11 100644 --- a/validations_common/roles/check_cpu/molecule/default/molecule.yml +++ b/validations_common/roles/check_cpu/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip + pkg_extras: python*setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/check_disk_space/molecule/default/molecule.yml b/validations_common/roles/check_disk_space/molecule/default/molecule.yml index e84978a..bcb4e11 100644 --- a/validations_common/roles/check_disk_space/molecule/default/molecule.yml +++ b/validations_common/roles/check_disk_space/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip + pkg_extras: python*setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml b/validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml index aa3d554..e688be1 100644 --- a/validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml +++ b/validations_common/roles/check_latest_packages_version/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools PyYAML - easy_install: - - pip + pkg_extras: python*setuptools python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools python*-PyYAML - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/check_ram/molecule/default/molecule.yml b/validations_common/roles/check_ram/molecule/default/molecule.yml index e84978a..bcb4e11 100644 --- a/validations_common/roles/check_ram/molecule/default/molecule.yml +++ b/validations_common/roles/check_ram/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip + pkg_extras: python*setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/check_selinux_mode/molecule/default/molecule.yml b/validations_common/roles/check_selinux_mode/molecule/default/molecule.yml index 64f0b97..7d47e5a 100644 --- a/validations_common/roles/check_selinux_mode/molecule/default/molecule.yml +++ b/validations_common/roles/check_selinux_mode/molecule/default/molecule.yml @@ -5,33 +5,36 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools PyYAML - easy_install: - - pip + pkg_extras: python*setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools ruby python*-PyYAML - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml + ANSIBLE_LIBRARY: "../../../../library" scenario: test_sequence: diff --git a/validations_common/roles/dns/molecule/default/molecule.yml b/validations_common/roles/dns/molecule/default/molecule.yml index e84978a..bcb4e11 100644 --- a/validations_common/roles/dns/molecule/default/molecule.yml +++ b/validations_common/roles/dns/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip + pkg_extras: python*setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/haproxy/molecule/default/molecule.yml b/validations_common/roles/haproxy/molecule/default/molecule.yml index 173bc31..397c103 100644 --- a/validations_common/roles/haproxy/molecule/default/molecule.yml +++ b/validations_common/roles/haproxy/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools haproxy PyYAML - easy_install: - - pip + pkg_extras: python*-setuptools haproxy python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools haproxy python*-PyYAML - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/ntp/molecule/default/molecule.yml b/validations_common/roles/ntp/molecule/default/molecule.yml index 1b71823..33d426e 100644 --- a/validations_common/roles/ntp/molecule/default/molecule.yml +++ b/validations_common/roles/ntp/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools python-enum34 ruby epel-release PyYAML - easy_install: - - pip + pkg_extras: python*setuptools python*-enum34 ruby python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools python*-enum34 ruby python*-PyYAML - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/service_status/molecule/default/molecule.yml b/validations_common/roles/service_status/molecule/default/molecule.yml index 0d175d8..3ee883c 100644 --- a/validations_common/roles/service_status/molecule/default/molecule.yml +++ b/validations_common/roles/service_status/molecule/default/molecule.yml @@ -5,34 +5,33 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 - pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com + dockerfile: Dockerfile + command: /sbin/init + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip - command: /sbin/init + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - command: /sbin/init - pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/service_status/molecule/docker/molecule.yml b/validations_common/roles/service_status/molecule/docker/molecule.yml index 71210c0..e2528c4 100644 --- a/validations_common/roles/service_status/molecule/docker/molecule.yml +++ b/validations_common/roles/service_status/molecule/docker/molecule.yml @@ -5,39 +5,34 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 - pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML - easy_install: - - pip + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com + dockerfile: Dockerfile + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML python*-libselinux command: /sbin/init capabilities: - SYS_ADMIN - privileged: true volumes: - /var/run/docker.sock:/var/run/docker.sock - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" - - name: centos8 - hostname: centos8 - image: centos:8 - command: /sbin/init - capabilities: - - SYS_ADMIN - privileged: true - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /sys/fs/cgroup:/sys/fs/cgroup:ro - pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML python*-libselinux - environment: - <<: *env - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/service_status/molecule/docker/playbook.yml b/validations_common/roles/service_status/molecule/docker/playbook.yml deleted file mode 100644 index b3db61a..0000000 --- a/validations_common/roles/service_status/molecule/docker/playbook.yml +++ /dev/null @@ -1,59 +0,0 @@ ---- -# Copyright 2019 Red Hat, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -- name: Converge - hosts: all - gather_facts: false - become: true - - tasks: - - name: "Check containers - docker version, no service" - include_role: - name: service_status - tasks_from: containers.yaml - - - name: "Check containers - docker version, with service" - block: - - name: Activate docker service - service: - name: docker - state: started - enabled: true - - - name: Catch failure - block: - - name: Run check - include_role: - name: service_status - tasks_from: containers.yaml - - rescue: - - name: Clear host errors - meta: clear_host_errors - - - name: Test output - debug: - msg: | - Success finding broken containers - - - name: End play - meta: end_play - - - name: Fail if this point is reached - fail: - msg: | - Did not find broken containers diff --git a/validations_common/roles/service_status/molecule/podman/molecule.yml b/validations_common/roles/service_status/molecule/podman/molecule.yml index 0d175d8..2c1f4ae 100644 --- a/validations_common/roles/service_status/molecule/podman/molecule.yml +++ b/validations_common/roles/service_status/molecule/podman/molecule.yml @@ -5,34 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 - pkg_extras: python-setuptools python-enum34 python-netaddr ruby epel-release PyYAML + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com + dockerfile: Dockerfile + pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip - command: /sbin/init + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - command: /sbin/init - pkg_extras: python*-setuptools python*-enum34 python*-netaddr ruby python*-PyYAML - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/service_status/molecule/podman/playbook.yml b/validations_common/roles/service_status/molecule/podman/playbook.yml deleted file mode 100644 index 9bef3a2..0000000 --- a/validations_common/roles/service_status/molecule/podman/playbook.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -# Copyright 2019 Red Hat, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -- name: Converge - hosts: all - gather_facts: false - vars: - service_status_podman_opt: '--storage-driver=vfs' - - tasks: - - name: Check podman container state - block: - - name: Detect failed podman containers - include_role: - name: service_status - tasks_from: containers.yaml - rescue: - - name: Clear host errors - meta: clear_host_errors - - - name: Test output - debug: - msg: | - Properly detected failed container - - - name: End play now - meta: end_play - - - name: Fail if we get to this point - fail: - msg: | - Did not detect failed container diff --git a/validations_common/roles/validate_selinux/molecule/default/molecule.yml b/validations_common/roles/validate_selinux/molecule/default/molecule.yml index 2e089af..7d47e5a 100644 --- a/validations_common/roles/validate_selinux/molecule/default/molecule.yml +++ b/validations_common/roles/validate_selinux/molecule/default/molecule.yml @@ -5,30 +5,32 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip + pkg_extras: python*setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw + privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml b/validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml index d54013c..e688be1 100644 --- a/validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml +++ b/validations_common/roles/xfs_check_ftype/molecule/default/molecule.yml @@ -5,35 +5,36 @@ driver: log: true platforms: - - name: centos7 - hostname: centos7 - image: centos:7 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile + pkg_extras: python*setuptools python*-PyYAML + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true - pkg_extras: python-setuptools - easy_install: - - pip environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}" https_proxy: "{{ lookup('env', 'https_proxy') }}" ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - privileged: true - pkg_extras: python*-setuptools - environment: - <<: *env - ulimits: *ulimit - provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml + ANSIBLE_LIBRARY: "../../../../library" scenario: test_sequence: