Skip to content

Commit

Permalink
Merge branch '18.0-fr1' into cherry-pick-802-to-18.0-fr1
Browse files Browse the repository at this point in the history
  • Loading branch information
jlarriba authored Nov 18, 2024
2 parents 1d26cfa + 725f2eb commit 74570c3
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/molecule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Install ansible
run: pip install ansible
- name: Install collections
run: ansible-galaxy collection install -r requirements.yml
run: ansible-galaxy collection install --force -r requirements.yml
- name: Install molecule deps
run: pip install -r molecule-requirements.txt
- name: Run molecule test
Expand Down
14 changes: 12 additions & 2 deletions roles/edpm_multipathd/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.

- name: Prepare
- name: Prepare test deps
hosts: all
gather_facts: false
roles:
Expand All @@ -23,4 +23,14 @@
- iproute
- iscsi-initiator-utils
- podman
- role: env_data
- name: Prepare
hosts: all
roles:
- role: osp.edpm.env_data
tasks:
- name: set /etc/localtime
become: true
ansible.builtin.file:
path: /etc/localtime
src: /usr/share/zoneinfo/UTC
state: link
7 changes: 7 additions & 0 deletions roles/edpm_telemetry/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
state: directory
mode: "0775"

- name: set /etc/localtime
become: true
ansible.builtin.file:
path: /etc/localtime
src: /usr/share/zoneinfo/UTC
state: link

- name: Create /run/libvirt directory
ansible.builtin.file:
path: "/run/libvirt"
Expand Down
2 changes: 1 addition & 1 deletion scripts/molecule_venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ fi
source $LOCAL_MOLECULE_ENV/bin/activate

pip install -r molecule-requirements.txt
ansible-galaxy collection install -r requirements.yml
ansible-galaxy collection install --force -r requirements.yml
./scripts/test_roles.py
deactivate

0 comments on commit 74570c3

Please sign in to comment.