Skip to content

Commit 299a5d6

Browse files
bshewaledanpawlik
authored andcommitted
Use local copy of common-requirements.txt while installation
This looks like something that can be avoided by using the local copy of that file instead of reaching out to github. It also seems like it will improve testing if the requirements file used is in-tree.
1 parent c1d7d04 commit 299a5d6

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

roles/reproducer/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# All variables intended for modification should be placed in this file.
1919
# All variables within this role should have a prefix of "cifmw_reproducer"
2020
cifmw_reproducer_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
21+
cifmw_reproducer_src_dir: "{{ cifmw_ci_src_dir | default( ansible_user_dir ~ '/src') }}"
2122
cifmw_reproducer_kubecfg: "{{ cifmw_libvirt_manager_configuration.vms.crc.image_local_dir }}/kubeconfig"
2223
cifmw_reproducer_params: {}
2324
cifmw_reproducer_run_job: true

roles/reproducer/tasks/configure_controller.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,13 @@
350350
name: sushy_emulator
351351
tasks_from: verify.yml
352352

353+
# NOTE: src dir is synchronized in libvirt_layout.yml
353354
- name: Install ansible dependencies
354355
register: _async_dep_install
355356
async: 600 # 10 minutes should be more than enough
356357
poll: 0
357358
ansible.builtin.pip:
358-
requirements: https://raw.githubusercontent.com/openstack-k8s-operators/ci-framework/main/common-requirements.txt
359+
requirements: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/ci-framework/common-requirements.txt"
359360

360361
- name: Inject most of the cifmw_ parameters passed to the reproducer run
361362
tags:

roles/reproducer/tasks/libvirt_layout.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
rsync -r {{ cifmw_reproducer_basedir }}/reproducer-inventory/
4949
zuul@controller-0:reproducer-inventory
5050
51+
- name: Push src dir to controller-0
52+
ansible.builtin.command: # noqa: command-instead-of-module
53+
cmd: >-
54+
rsync -r {{ cifmw_reproducer_src_dir }}/
55+
zuul@controller-0:src
56+
5157
- name: Run post tasks in OCP cluster case
5258
when:
5359
- _use_ocp | bool

0 commit comments

Comments
 (0)