From 2fb38088862399201a4bc15dd01fbdc8adb8e690 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Thu, 20 Feb 2020 08:47:32 +0200 Subject: [PATCH] Use CI mirrors for molecule jobs Mount mirrors file into molecule containers if docker driver is used, otherwise use hosts mirrors file. Change-Id: I179004fde7587a81eb87f3cc477870b4b48bd83e (cherry picked from commit dcf8c98fb938a61d5a323f65af2f36bda72204f1) --- .../roles/aide/molecule/default/molecule.yml | 4 +++ .../login-defs/molecule/default/molecule.yml | 4 +++ .../roles/test_deps/defaults/main.yml | 1 + .../test_deps/molecule/default/molecule.yml | 4 +++ .../roles/test_deps/tasks/main.yml | 35 +++++++++++++++++-- .../molecule/default/molecule.yml | 4 +++ .../molecule/negative/molecule.yml | 4 +++ .../molecule/positive/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/addkey/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/keygen/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/hieradata_vars/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 2 ++ .../molecule/legacy_vars/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 2 ++ .../molecule/positive/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 2 ++ .../molecule/external_upgrade/molecule.yml | 2 ++ .../molecule/ffu/molecule.yml | 2 ++ .../molecule/update/molecule.yml | 1 + .../molecule/upgrade/molecule.yml | 1 + .../molecule/default/molecule.yml | 4 +++ .../tripleo-ptp/molecule/default/molecule.yml | 2 ++ .../molecule/ntp_stop/molecule.yml | 1 + .../molecule/create/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../molecule/banners/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 2 ++ .../molecule/default/molecule.yml | 4 +++ .../molecule/default/molecule.yml | 4 +++ .../roles/tuned/molecule/default/molecule.yml | 2 ++ .../tuned/molecule/isolated/molecule.yml | 2 ++ 49 files changed, 179 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/roles/aide/molecule/default/molecule.yml b/tripleo_ansible/roles/aide/molecule/default/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/aide/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/aide/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml b/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/login-defs/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/test_deps/defaults/main.yml b/tripleo_ansible/roles/test_deps/defaults/main.yml index 1e30e86e7..da6681cc8 100644 --- a/tripleo_ansible/roles/test_deps/defaults/main.yml +++ b/tripleo_ansible/roles/test_deps/defaults/main.yml @@ -18,3 +18,4 @@ test_deps_extra_packages: [] test_deps_setup_tripleo: false test_deps_repo_version: "{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}-master" +test_deps_mirrors_file_path: /etc/ci/mirror_info.sh diff --git a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_deps/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/test_deps/tasks/main.yml b/tripleo_ansible/roles/test_deps/tasks/main.yml index 2fdb55c51..a9e4a41cf 100644 --- a/tripleo_ansible/roles/test_deps/tasks/main.yml +++ b/tripleo_ansible/roles/test_deps/tasks/main.yml @@ -31,6 +31,37 @@ tags: - always +- name: Detect mirrors file + stat: + path: "{{ test_deps_mirrors_file_path }}" + register: mirrors_file + +- when: mirrors_file.stat.exists + block: + + - name: Discover mirror for RDO if exists + shell: | + source {{ test_deps_mirrors_file_path }} + echo $NODEPOOL_RDO_PROXY + register: rdo_mirror_proxy + changed_when: false + + - name: Set fact for the mirror with proxy + set_fact: + rdo_mirror: "{{ rdo_mirror_proxy.stdout|default('https://trunk.rdoproject.org', true) }}" + +- name: Set fact for the mirror without proxy + set_fact: + rdo_mirror: 'https://trunk.rdoproject.org' + when: not mirrors_file.stat.exists + +- name: Print used mirror + debug: var=rdo_mirror + +- name: Set test_deps_repo + set_fact: + test_deps_repo: "{{ test_deps_repo.replace('https://trunk.rdoproject.org', rdo_mirror) }}" + - name: RHEL Block become: true when: @@ -38,12 +69,12 @@ block: - name: install deplorean repo get_url: - url: "https://trunk.rdoproject.org/{{ test_deps_repo_version }}/current-tripleo/delorean.repo" + url: "{{ rdo_mirror }}/{{ test_deps_repo_version }}/current-tripleo/delorean.repo" dest: /etc/yum.repos.d/delorean.repo - name: install deplorean-deps repo get_url: - url: "https://trunk.rdoproject.org/{{ test_deps_repo_version }}/delorean-deps.repo" + url: "{{ rdo_mirror }}/{{ test_deps_repo_version }}/delorean-deps.repo" dest: /etc/yum.repos.d/delorean-deps.repo - include_tasks: tripleo-setup.yml 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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/negative/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/test_package_action/molecule/positive/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml index 6c21009f8..bc68a55a0 100644 --- a/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-bootstrap/molecule/default/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-cellv2/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *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 2b0444e32..f294be515 100644 --- a/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ceph-common/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/molecule.yml index 2b0444e32..f294be515 100644 --- a/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ceph-fetch-dir/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 2b0444e32..f294be515 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 @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 2b0444e32..f294be515 100644 --- a/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ceph-uuid/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 2b0444e32..f294be515 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 @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-clients-install/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-config/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 a92a446f3..f2b6c89ed 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 @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/addkey/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml +++ b/tripleo_ansible/roles/tripleo-create-admin/molecule/keygen/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 3756ff5fb..b71fa9dc7 100644 --- a/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 3c8319344..de355d3b6 100644 --- a/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-hosts-entries/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 129b9af57..ab5d54f23 100644 --- a/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-image-serve/molecule/default/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible 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 129b9af57..ab5d54f23 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 @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml index 525cf0bdb..694685171 100644 --- a/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-keystone-resources/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile network_mode: host + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml index 0434dcc69..7d9a70695 100644 --- a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/default/molecule.yml @@ -25,6 +25,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -44,6 +45,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml index 0434dcc69..7d9a70695 100644 --- a/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ovs-dpdk/molecule/positive/molecule.yml @@ -25,6 +25,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -44,6 +45,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml index fe9691f4a..3f196a256 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/default/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /dev:/dev - /lib/modules:/lib/modules + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /dev:/dev - /lib/modules:/lib/modules + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible 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 fe9691f4a..3f196a256 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/external_upgrade/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /dev:/dev - /lib/modules:/lib/modules + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /dev:/dev - /lib/modules:/lib/modules + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml b/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml index 42ba0652a..a7c4a5aae 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/ffu/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /dev:/dev - /lib/modules:/lib/modules + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /dev:/dev - /lib/modules:/lib/modules + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml b/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml index 766f92628..0a2b07d86 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/update/molecule.yml @@ -28,6 +28,7 @@ platforms: volumes: - /dev:/dev - /lib/modules:/lib/modules + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro # TODO(cloudnull): when RDO has centos8 repos this test node should be re-enabled. # diff --git a/tripleo_ansible/roles/tripleo-packages/molecule/upgrade/molecule.yml b/tripleo_ansible/roles/tripleo-packages/molecule/upgrade/molecule.yml index dde0f4591..77f4970f1 100644 --- a/tripleo_ansible/roles/tripleo-packages/molecule/upgrade/molecule.yml +++ b/tripleo_ansible/roles/tripleo-packages/molecule/upgrade/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /dev:/dev - /lib/modules:/lib/modules + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro # TODO(cloudnull): when RDO has centos8 repos this test node should be re-enabled. # diff --git a/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-persist/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml index 22fff8f15..ed71a5f6e 100644 --- a/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ptp/molecule/default/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/molecule.yml b/tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/molecule.yml index b75328c08..113530cfa 100644 --- a/tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/molecule.yml +++ b/tripleo_ansible/roles/tripleo-ptp/molecule/ntp_stop/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml b/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml +++ b/tripleo_ansible/roles/tripleo-securetty/molecule/create/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml index a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-securetty/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 119406952..c9d6d3896 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 @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml b/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml index 129b9af57..ab5d54f23 100644 --- a/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml +++ b/tripleo_ansible/roles/tripleo-sshd/molecule/banners/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml index 129b9af57..ab5d54f23 100644 --- a/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-sshd/molecule/default/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible 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 1bbda47e2..cd03aaa5c 100644 --- a/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/molecule/default/molecule.yml @@ -21,6 +21,7 @@ platforms: - SYS_ADMIN volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -35,6 +36,7 @@ platforms: - SYS_ADMIN volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml index 22fff8f15..ed71a5f6e 100644 --- a/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-timezone/molecule/default/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml index b24d9b403..cfc300813 100644 --- a/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-transfer/molecule/default/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: overcloud-controller-1 hostname: overcloud-controller-1 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible 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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-upgrade-hiera/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env 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 a92a446f3..f2b6c89ed 100644 --- a/tripleo_ansible/roles/tripleo-validations-package/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo-validations-package/molecule/default/molecule.yml @@ -10,6 +10,8 @@ platforms: image: centos:7 dockerfile: Dockerfile pkg_extras: python-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro easy_install: - pip environment: &env @@ -21,6 +23,8 @@ platforms: image: centos:8 dockerfile: Dockerfile pkg_extras: python*-setuptools + volumes: + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro environment: <<: *env diff --git a/tripleo_ansible/roles/tuned/molecule/default/molecule.yml b/tripleo_ansible/roles/tuned/molecule/default/molecule.yml index 129b9af57..ab5d54f23 100644 --- a/tripleo_ansible/roles/tuned/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tuned/molecule/default/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible diff --git a/tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml b/tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml index 129b9af57..ab5d54f23 100644 --- a/tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml +++ b/tripleo_ansible/roles/tuned/molecule/isolated/molecule.yml @@ -24,6 +24,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - name: centos8 hostname: centos8 @@ -43,6 +44,7 @@ platforms: volumes: - /run/udev:/run/udev:ro - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro provisioner: name: ansible