From c28dde74698c231d5e34838a4c2dc6a7e96e87cf Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 15 Sep 2020 14:49:58 -0500 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. Story: 2006061 Task: 34774 Change-Id: I067046e5fd4d56cd88712f553e25a61db60ced7f Signed-off-by: Kevin Carter --- _skeleton_role_/molecule/default/molecule.yml | 31 ++++---- bindep.txt | 3 + .../roles/aide/molecule/default/molecule.yml | 32 ++++----- .../login_defs/molecule/default/molecule.yml | 32 ++++----- .../test_deps/molecule/default/molecule.yml | 32 ++++----- .../roles/test_deps/tasks/main.yml | 2 +- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/negative/molecule.yml | 32 ++++----- .../molecule/positive/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 29 ++++---- .../molecule/default/molecule.yml | 29 ++++---- .../molecule/default/molecule.yml | 29 ++++---- .../molecule/default/molecule.yml | 29 ++++---- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 19 +++-- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/addkey/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/keygen/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 21 ++++-- .../molecule/default/molecule.yml | 19 +++-- .../molecule/ansible_hieradata/molecule.yml | 33 ++++----- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/hieradata_vars/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 37 ++++------ .../molecule/default/verify.yml | 9 +-- .../molecule/default/molecule.yml | 48 ++++++------- .../molecule/legacy_vars/molecule.yml | 48 ++++++------- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 33 ++++----- .../molecule/default/molecule.yml | 54 ++++++-------- .../molecule/external_upgrade/molecule.yml | 54 ++++++-------- .../molecule/ffu/molecule.yml | 54 ++++++-------- .../molecule/update/molecule.yml | 54 +++++--------- .../molecule/upgrade/Dockerfile | 37 ---------- .../molecule/upgrade/converge.yml | 47 ------------ .../molecule/upgrade/molecule.yml | 72 ------------------- .../molecule/upgrade/prepare.yml | 26 ------- .../molecule/default/molecule.yml | 32 ++++----- .../tripleo_ptp/molecule/default/molecule.yml | 48 ++++++------- .../tripleo_ptp/molecule/default/prepare.yml | 3 + .../tripleo_ptp/molecule/ntp_stop/Dockerfile | 37 ---------- .../molecule/ntp_stop/converge.yml | 24 ------- .../molecule/ntp_stop/molecule.yml | 43 ----------- .../tripleo_ptp/molecule/ntp_stop/prepare.yml | 27 ------- .../molecule/default/molecule.yml | 34 ++++----- .../molecule/default/prepare.yml | 3 + .../molecule/default/molecule.yml | 35 ++++----- .../molecule/create/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 32 ++++----- .../molecule/default/molecule.yml | 46 +++++------- .../molecule/default/tests/test_default.py | 3 +- .../molecule/no_networks/molecule.yml | 33 ++++----- .../no_networks/tests/test_no_networks.py | 3 +- .../molecule/banners/molecule.yml | 48 ++++++------- .../molecule/default/molecule.yml | 48 ++++++------- .../molecule/default/molecule.yml | 52 ++++++-------- .../molecule/default/molecule.yml | 49 ++++++------- .../molecule/default/prepare.yml | 3 + .../molecule/default/molecule.yml | 41 +++++++---- .../molecule/default/molecule.yml | 35 ++++----- .../molecule/default/molecule.yml | 35 ++++----- .../molecule/default/prepare.yml | 4 ++ zuul.d/playbooks/pre.yml | 7 ++ 68 files changed, 848 insertions(+), 1302 deletions(-) delete mode 100644 tripleo_ansible/roles/tripleo_packages/molecule/upgrade/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_packages/molecule/upgrade/converge.yml delete mode 100644 tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml delete mode 100644 tripleo_ansible/roles/tripleo_packages/molecule/upgrade/prepare.yml delete mode 100644 tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/Dockerfile delete mode 100644 tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/converge.yml delete mode 100644 tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/molecule.yml delete mode 100644 tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/prepare.yml diff --git a/_skeleton_role_/molecule/default/molecule.yml b/_skeleton_role_/molecule/default/molecule.yml index 8d3c2ab1e..f448198fe 100644 --- a/_skeleton_role_/molecule/default/molecule.yml +++ b/_skeleton_role_/molecule/default/molecule.yml @@ -5,33 +5,30 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + 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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/bindep.txt b/bindep.txt index e1c91ef94..7f5e7fe06 100644 --- a/bindep.txt +++ b/bindep.txt @@ -25,6 +25,9 @@ PyYAML [platform:rpm !platform:rhel-8 !platform:centos-8] python3-pyyaml [platform:rpm !platform:rhel-7 !platform:centos-7] python3-dnf [platform:rpm !platform:rhel-7 !platform:centos-7] +# RH Mechanisms +python-rhsm-certificates [platform:redhat] + # SELinux cent7 libselinux-python3 [platform:rpm !platform:rhel-8 !platform:centos-8] libsemanage-python3 [platform:redhat !platform:rhel-8 !platform:centos-8] diff --git a/tripleo_ansible/roles/aide/molecule/default/molecule.yml b/tripleo_ansible/roles/aide/molecule/default/molecule.yml index 42b52b06a..f433cdc49 100644 --- a/tripleo_ansible/roles/aide/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/aide/molecule/default/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml b/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml index 42b52b06a..f433cdc49 100644 --- a/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/login_defs/molecule/default/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml index 42b52b06a..f433cdc49 100644 --- a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/test_deps/tasks/main.yml b/tripleo_ansible/roles/test_deps/tasks/main.yml index 86816dc10..d821bc510 100644 --- a/tripleo_ansible/roles/test_deps/tasks/main.yml +++ b/tripleo_ansible/roles/test_deps/tasks/main.yml @@ -44,7 +44,7 @@ block: - name: Fetch latest repo version uri: - url: https://trunk.rdoproject.org/{{ (ansible_distribution | lower) }}{{ ansible_distribution_major_version }}/current/delorean.repo + url: https://trunk.rdoproject.org/centos{{ ansible_distribution_major_version }}/current/delorean.repo return_content: true register: tripleo_packages diff --git a/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml index 42b52b06a..f433cdc49 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml index 42b52b06a..f433cdc49 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml b/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml index 42b52b06a..f433cdc49 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml index 42b52b06a..f433cdc49 100644 --- a/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_cellv2/molecule/default/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml index 79c04658d..c238db8e1 100644 --- a/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_common/molecule/default/molecule.yml @@ -5,37 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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 vars: ansible_user: root log: true diff --git a/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml index 79c04658d..c238db8e1 100644 --- a/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/molecule.yml @@ -5,37 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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 vars: ansible_user: root log: true diff --git a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml index 79c04658d..c238db8e1 100644 --- a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/molecule.yml @@ -5,37 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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 vars: ansible_user: root log: true diff --git a/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml index 79c04658d..c238db8e1 100644 --- a/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/molecule.yml @@ -5,37 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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 vars: ansible_user: root log: true diff --git a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml index 8d3c2ab1e..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml index 8d3c2ab1e..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_config/molecule/default/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/molecule.yml index 9ffe25d2d..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_container_image_build/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + 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') }}" @@ -20,6 +25,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml index 0f942d4f2..0827dbdd4 100644 --- a/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_container_image_prepare/molecule/default/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml index 8d3c2ab1e..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml index 8d3c2ab1e..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml index 8d3c2ab1e..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml +++ b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml index 5388a7548..ce17cef2e 100644 --- a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/molecule.yml @@ -5,21 +5,32 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + 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') }}" - ulimts: &ulimit + ulimits: &ulimit - host provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml index 9ffe25d2d..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml @@ -5,13 +5,18 @@ driver: log: true platforms: - - name: centos8 - hostname: centos8 - image: centos:8 + - name: ubi8 + hostname: ubi8 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python*-setuptools + 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') }}" @@ -20,6 +25,12 @@ platforms: provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml index 3b187fa37..f3e3f0a90 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/ansible_hieradata/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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') }}" - - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env + ulimits: &ulimit + - host provisioner: name: ansible inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: all_nodes_extra_map_data: {} cloud_domain: localdomain @@ -258,8 +256,7 @@ provisioner: validate_ntp: true Standalone: hosts: - centos8: {} - centos7: {} + ubi8: {} log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml index 8d3c2ab1e..9b5c2b3fb 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/default/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml index 9e8c6f750..f3e3f0a90 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml @@ -5,37 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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 vars: all_nodes_extra_map_data: {} cloud_domain: localdomain @@ -261,8 +256,7 @@ provisioner: validate_ntp: true Standalone: hosts: - centos8: {} - centos7: {} + ubi8: {} log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml index d21953e33..d83ebe958 100644 --- a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml @@ -5,40 +5,35 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: - name: ansible log: true env: ANSIBLE_STDOUT_CALLBACK: yaml + name: ansible inventory: hosts: all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 vars: # use a tmp hosts path since /etc/hosts isn't writeable in the # molecule test containers @@ -62,14 +57,10 @@ provisioner: children: allovercloud: hosts: - centos8: + ubi8: hostname_resolve_network: ctlplane ctlplane_ip: 192.168.24.1 internal_api_ip: 172.17.0.1 - centos7: - hostname_resolve_network: ctlplane - ctlplane_ip: 192.168.24.2 - internal_api_ip: 172.17.0.2 scenario: test_sequence: diff --git a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/verify.yml index fbdc36d24..c5f0205f8 100644 --- a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/verify.yml +++ b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/verify.yml @@ -26,12 +26,9 @@ register: hosts_result check_mode: true loop: - - 192.168.24.2 centos7.localdomain centos7 - - 192.168.24.2 centos7.ctlplane.localdomain centos7.ctlplane - - 172.17.0.2 centos7.internalapi.localdomain centos7.internalapi - - 192.168.24.1 centos8.localdomain centos8 - - 192.168.24.1 centos8.ctlplane.localdomain centos8.ctlplane - - 172.17.0.1 centos8.internalapi.localdomain centos8.internalapi + - 192.168.24.1 ubi8.localdomain ubi8 + - 192.168.24.1 ubi8.ctlplane.localdomain ubi8.ctlplane + - 172.17.0.1 ubi8.internalapi.localdomain ubi8.internalapi - name: slurp /tmp/hosts slurp: 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 e5726bbbf..f8c3d9bf8 100644 --- a/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_image_serve/molecule/default/molecule.yml @@ -5,42 +5,34 @@ 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 + 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 + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - 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 - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: 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 e5726bbbf..f8c3d9bf8 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 @@ -5,42 +5,34 @@ 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 + 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 + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - 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 - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml index 7e2b3b9e1..09a75b625 100644 --- a/tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml index 7e2b3b9e1..09a75b625 100644 --- a/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nodes_validation/molecule/default/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml index 42b52b06a..f433cdc49 100644 --- a/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nova_image_cache/molecule/default/molecule.yml @@ -5,33 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml index d4a2ab437..20db0c67b 100644 --- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml @@ -5,30 +5,31 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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') }}" - - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env + ulimits: &ulimit + - host provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml index 7b62ded8a..6731e3b9d 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml @@ -5,46 +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 - easy_install: - - pip + pkg_extras: python*setuptools + command: /sbin/init + capabilities: + - ALL + volumes: + - /dev:/dev + - /lib/modules:/lib/modules + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: 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 7b62ded8a..6731e3b9d 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml @@ -5,46 +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 - easy_install: - - pip + pkg_extras: python*setuptools + command: /sbin/init + capabilities: + - ALL + volumes: + - /dev:/dev + - /lib/modules:/lib/modules + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true - ulimits: *ulimit - provisioner: + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 name: ansible log: true env: diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml index 0051e52c8..36c4fc23f 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml @@ -5,47 +5,37 @@ 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 + command: /sbin/init + capabilities: + - ALL + volumes: + - /dev:/dev + - /lib/modules:/lib/modules + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true - 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/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml index 0afe8e3e7..fe145c374 100644 --- a/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml +++ b/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml @@ -5,61 +5,41 @@ 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 - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" + pkg_extras: python*setuptools command: >- /sbin/init && /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 - /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 -# TODO(cloudnull): when RDO has centos8 repos this test node should be re-enabled. -# -# - name: centos8 -# hostname: centos8 -# image: centos:8 -# dockerfile: Dockerfile -# pkg_extras: python*-setuptools -# environment: -# http_proxy: "{{ lookup('env', 'http_proxy') }}" -# https_proxy: "{{ lookup('env', 'https_proxy') }}" -# command: >- -# /sbin/init && -# /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 -# -# tmpfs: -# - /run -# - /tmp -# capabilities: -# - ALL -# volumes: -# - /dev:/dev -# - /lib/modules:/lib/modules -# privileged: true -# 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/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/Dockerfile b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# 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. - - -{% if item.registry is defined %} -FROM {{ item.registry.url }}/{{ item.image }} -{% else %} -FROM {{ item.image }} -{% endif %} - -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ - elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi - -{% for pkg in item.easy_install | default([]) %} -# install pip for centos where there is no python-pip rpm in default repos -RUN easy_install {{ pkg }} -{% endfor %} - - -CMD ["sh", "-c", "while true; do sleep 10000; done"] diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/converge.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/converge.yml deleted file mode 100644 index d95c0102f..000000000 --- a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/converge.yml +++ /dev/null @@ -1,47 +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 - tasks: - - name: Import TripleO packages role (step|0) - include_role: - name: tripleo_packages - tasks_from: upgrade.yml - vars: - step: 0 - - - name: Import TripleO packages role (step|2) - include_role: - name: tripleo_packages - tasks_from: upgrade.yml - vars: - step: 2 - - - name: Import TripleO packages role (step|3) - include_role: - name: tripleo_packages - tasks_from: upgrade.yml - vars: - step: 3 - - - name: Import TripleO packages role (step|4) - include_role: - name: tripleo_packages - tasks_from: upgrade.yml - vars: - step: 4 diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml deleted file mode 100644 index 69197d60b..000000000 --- a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/molecule.yml +++ /dev/null @@ -1,72 +0,0 @@ ---- -driver: - name: podman - -log: true - -platforms: - - name: centos7 - hostname: centos7 - image: centos:7 - dockerfile: Dockerfile - pkg_extras: python-setuptools openvswitch numactl-libs* unbound-libs* - easy_install: - - pip - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /dev:/dev - - /lib/modules:/lib/modules - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true - ulimits: &ulimit - - host - -# TODO(cloudnull): when RDO has centos8 repos this test node should be re-enabled. -# -# - name: centos8 -# hostname: centos8 -# image: centos:8 -# dockerfile: Dockerfile -# pkg_extras: python*-setuptools openvswitch 'dnf-command(download)' unbound-libs* -# environment: -# http_proxy: "{{ lookup('env', 'http_proxy') }}" -# https_proxy: "{{ lookup('env', 'https_proxy') }}" -# command: /sbin/init -# -# tmpfs: -# - /run -# - /tmp -# capabilities: -# - ALL -# volumes: -# - /dev:/dev -# - /lib/modules:/lib/modules -# privileged: true -# ulimits: *ulimit - -provisioner: - name: ansible - log: true - env: - ANSIBLE_STDOUT_CALLBACK: yaml - ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH:-/usr/share/ansible/roles}:${HOME}/zuul-jobs/roles" - ANSIBLE_LIBRARY: "${ANSIBLE_LIBRARY:-/usr/share/ansible/plugins/modules}" - ANSIBLE_FILTER_PLUGINS: "${ANSIBLE_FILTER_PLUGINS:-/usr/share/ansible/plugins/filter}" - ANSIBLE_ACTION_PLUGINS: "${ANSIBLE_ACTION_PLUGINS:-/usr/share/ansible/plugins/action}" - -scenario: - test_sequence: - - destroy - - create - - prepare - - converge - - verify - - destroy - -verifier: - name: testinfra diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/prepare.yml deleted file mode 100644 index fbc0a1d2a..000000000 --- a/tripleo_ansible/roles/tripleo_packages/molecule/upgrade/prepare.yml +++ /dev/null @@ -1,26 +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: Prepare - hosts: all - tasks: - - include_role: - name: test_deps - vars: - test_deps_setup_tripleo: true - test_deps_extra_packages: - - openvswitch diff --git a/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml index 42b52b06a..bcb4e1144 100644 --- a/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_persist/molecule/default/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml index 7b475b198..9a0e13cc8 100644 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ptp/molecule/default/molecule.yml @@ -5,43 +5,35 @@ 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 cronie rsyslog - easy_install: - - pip + 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 + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools cronie rsyslog - environment: - 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 - 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/tripleo_ansible/roles/tripleo_ptp/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/default/prepare.yml index ef85c3128..ce8b30adc 100644 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_ptp/molecule/default/prepare.yml @@ -19,3 +19,6 @@ hosts: all roles: - role: test_deps + test_deps_extra_packages: + - cronie + - rsyslog diff --git a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/Dockerfile b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/Dockerfile deleted file mode 100644 index e0534b4d1..000000000 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -# Molecule managed -# 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. - - -{% if item.registry is defined %} -FROM {{ item.registry.url }}/{{ item.image }} -{% else %} -FROM {{ item.image }} -{% endif %} - -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \ - elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi - -{% for pkg in item.easy_install | default([]) %} -# install pip for centos where there is no python-pip rpm in default repos -RUN easy_install {{ pkg }} -{% endfor %} - - -CMD ["sh", "-c", "while true; do sleep 10000; done"] diff --git a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/converge.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/converge.yml deleted file mode 100644 index 65d79f761..000000000 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/converge.yml +++ /dev/null @@ -1,24 +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 - tasks: - - name: Run ntp stop - include_role: - name: tripleo_ptp - tasks_from: tripleo_ntp_stop.yml diff --git a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/molecule.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/molecule.yml deleted file mode 100644 index 55f7b086d..000000000 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/molecule.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- -driver: - name: podman - -log: true - -platforms: - - name: centos7 - hostname: centos7 - image: centos:7 - dockerfile: Dockerfile - pkg_extras: python-setuptools ntp cronie rsyslog - easy_install: - - pip - environment: &env - 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 - ulimits: &ulimit - - host - -provisioner: - name: ansible - log: true - env: - ANSIBLE_STDOUT_CALLBACK: yaml - -scenario: - test_sequence: - - destroy - - create - - prepare - - converge - - verify - - destroy - -verifier: - name: testinfra diff --git a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/prepare.yml b/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/prepare.yml deleted file mode 100644 index ee39e9c4a..000000000 --- a/tripleo_ansible/roles/tripleo_ptp/molecule/ntp_stop/prepare.yml +++ /dev/null @@ -1,27 +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: Prepare - hosts: all - roles: - - role: test_deps - post_tasks: - - name: Start ntpd - systemd: - name: ntpd - state: started - enabled: true 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 8d3c2ab1e..fb311b7d7 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/molecule.yml @@ -5,34 +5,34 @@ 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 + pkg_extras: python*setuptools + capabilities: + - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml index ff0d2637c..2c1cbd781 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml @@ -24,6 +24,9 @@ roles: - role: test_deps post_tasks: + - name: Create tripleo repos + command: tripleo-repos current-tripleo + become: true - name: Install required packages become: true package: 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 78971ff18..c78d715b3 100644 --- a/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml @@ -5,31 +5,34 @@ 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 + pkg_extras: python*setuptools + capabilities: + - ALL volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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') }}" - - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - environment: - <<: *env + ulimits: &ulimit + - host provisioner: name: ansible + inventory: + hosts: + all: + hosts: + ubi8: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml index 42b52b06a..bcb4e1144 100644 --- a/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml +++ b/tripleo_ansible/roles/tripleo_securetty/molecule/create/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml index 42b52b06a..bcb4e1144 100644 --- a/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_securetty/molecule/default/molecule.yml @@ -5,34 +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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml index 912db23d4..eac3123ba 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml @@ -5,58 +5,44 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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 children: allovercloud: hosts: - centos8: + ubi8: ansible_ssh_host_key_rsa_public: AAAATEST ctlplane_ip: 10.0.0.1 - ctlplane_hostname: centos8.ctlplane.localdomain + ctlplane_hostname: ubi8.ctlplane.localdomain internal_api_ip: 10.0.1.1 - internal_api_hostname: centos8.internalapi.localdomain + internal_api_hostname: ubi8.internalapi.localdomain management_ip: 10.0.0.1 # no management_hostname - canonical_hostname: centos8.localdomain + canonical_hostname: ubi8.localdomain tripleo_role_networks: [ctlplane, internal_api, management] - centos7: - ansible_ssh_host_key_rsa_public: BBBBTEST - hostname_resolve_network: ctlplane - ctlplane_ip: 10.0.0.2 - ctlplane_hostname: centos7.ctlplane.localdomain - internal_api_ip: 10.0.1.2 - internal_api_hostname: centos7.internalapi.localdomain - canonical_hostname: centos7.localdomain - tripleo_role_networks: [ctlplane, internal_api] log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py index c12b2cf67..04478afff 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/tests/test_default.py @@ -25,8 +25,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_ssh_host_keys(host): expected = [ - '[10.0.0.1]*,[centos8.ctlplane.localdomain]*,[10.0.1.1]*,[centos8.internalapi.localdomain]*,[centos8.localdomain]*,[centos8]* ssh-rsa AAAATEST', - '[10.0.0.2]*,[centos7.ctlplane.localdomain]*,[10.0.1.2]*,[centos7.internalapi.localdomain]*,[centos7.localdomain]*,[centos7]* ssh-rsa BBBBTEST' + '[10.0.0.1]*,[ubi8.ctlplane.localdomain]*,[10.0.1.1]*,[ubi8.internalapi.localdomain]*,[ubi8.localdomain]*,[ubi8]* ssh-rsa AAAATEST', ] known_hosts = host.file("/etc/ssh/ssh_known_hosts").content_string for line in expected: diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml index d34f4ee1f..5feaacdb8 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml @@ -5,44 +5,37 @@ 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 + pkg_extras: python*setuptools volumes: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - easy_install: - - pip + - /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 - 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 children: allovercloud: hosts: - centos8: + ubi8: ansible_ssh_host_key_rsa_public: AAAATEST - centos7: - ansible_ssh_host_key_rsa_public: BBBBTEST log: true env: ANSIBLE_STDOUT_CALLBACK: yaml diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/tests/test_no_networks.py b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/tests/test_no_networks.py index ffb5f0779..733e1d8ee 100644 --- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/tests/test_no_networks.py +++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/tests/test_no_networks.py @@ -25,8 +25,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_ssh_host_keys(host): expected = [ - '[centos8]* ssh-rsa AAAATEST', - '[centos7]* ssh-rsa BBBBTEST' + '[ubi8]* ssh-rsa AAAATEST', ] known_hosts = host.file("/etc/ssh/ssh_known_hosts").content_string for line in expected: diff --git a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml index e5726bbbf..399075869 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml @@ -5,43 +5,35 @@ 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 + 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 + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - 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 - 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/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml index e5726bbbf..399075869 100644 --- a/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml @@ -5,43 +5,35 @@ 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 + 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 + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - 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 - 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/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml index 8839cf4db..1eace9c79 100644 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/molecule.yml @@ -5,46 +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 - easy_install: - - pip + 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 + - /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') }}" - # needed for systemd stuff - command: /sbin/init - capabilities: - - ALL - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools - environment: - <<: *env - # needed for systemd stuff - command: /sbin/init - capabilities: - - ALL - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true - 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/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml index 0c8cb80f6..1eace9c79 100644 --- a/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_timezone/molecule/default/molecule.yml @@ -5,43 +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 cronie rsyslog - easy_install: - - pip + 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 + - /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') }}" - command: /sbin/init - capabilities: - - ALL - volumes: - - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - privileged: true ulimits: &ulimit - host - - name: centos8 - hostname: centos8 - image: centos:8 - dockerfile: Dockerfile - pkg_extras: python*-setuptools cronie rsyslog - environment: - 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 - 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/tripleo_ansible/roles/tripleo_timezone/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_timezone/molecule/default/prepare.yml index ef85c3128..ce8b30adc 100644 --- a/tripleo_ansible/roles/tripleo_timezone/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_timezone/molecule/default/prepare.yml @@ -19,3 +19,6 @@ hosts: all roles: - role: test_deps + test_deps_extra_packages: + - cronie + - rsyslog diff --git a/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml index c251212fd..a70252dca 100644 --- a/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_transfer/molecule/default/molecule.yml @@ -7,42 +7,53 @@ log: true platforms: - name: overcloud-controller-0 hostname: overcloud-controller-0 - image: centos:7 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip - environment: &env - http_proxy: "{{ lookup('env', 'http_proxy') }}" - https_proxy: "{{ lookup('env', 'https_proxy') }}" + 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 + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true - ulimits: &ulimit + environment: + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" + ulimits: - host - name: overcloud-controller-1 hostname: overcloud-controller-1 - image: centos:7 + image: ubi8/ubi-init + registry: + url: registry.access.redhat.com dockerfile: Dockerfile - pkg_extras: python-setuptools - easy_install: - - pip - environment: - <<: *env + 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 + - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg + - /opt/yum.repos.d:/etc/yum.repos.d:rw privileged: true - ulimits: *ulimit + environment: + http_proxy: "{{ lookup('env', 'http_proxy') }}" + https_proxy: "{{ lookup('env', 'https_proxy') }}" + ulimits: + - host provisioner: name: ansible + inventory: + vars: + ansible_python_interpreter: /usr/bin/python3 log: true env: ANSIBLE_STDOUT_CALLBACK: yaml 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 42b52b06a..c08c90e8d 100644 --- a/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_upgrade_hiera/molecule/default/molecule.yml @@ -5,34 +5,35 @@ 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 + 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 - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml index 42b52b06a..c08c90e8d 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml @@ -5,34 +5,35 @@ 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 + 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 - easy_install: - - pip + - /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 - 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/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml index ef85c3128..a5b2d7a39 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml @@ -19,3 +19,7 @@ hosts: all roles: - role: test_deps + post_tasks: + - name: Create tripleo repos + command: tripleo-repos current-tripleo + become: true diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml index 32aa3d5a3..96fc843be 100644 --- a/zuul.d/playbooks/pre.yml +++ b/zuul.d/playbooks/pre.yml @@ -84,6 +84,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 tasks: