Skip to content

Commit e6ccd23

Browse files
amartyasinhadanpawlik
authored andcommitted
Replace hardcoded values with group_vars
Some hardcoded paths landed again. Let's use relative path vars to avoid hardcoding. Signed-off-by: Amartya Sinha <[email protected]>
1 parent 5fdc077 commit e6ccd23

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

roles/reproducer/tasks/configure_controller.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359

360360
- name: Check if common-requirements.txt exists on controller-0
361361
ansible.builtin.stat:
362-
path: "{{ cifmw_reproducer_controller_user_dir }}/src/github.com/openstack-k8s-operators/ci-framework/common-requirements.txt"
362+
path: "{{ cifmw_reproducer_controller_user_dir }}/{{ cifmw_project_dir }}/common-requirements.txt"
363363
register: _controller_common_requirements_check
364364
run_once: true
365365
ignore_errors: true
@@ -372,7 +372,7 @@
372372
requirements: "{{ have_controller_reqs | ternary(controller_reqs, remote) }}"
373373
vars:
374374
have_controller_reqs: "{{ _controller_common_requirements_check.stat is defined and _controller_common_requirements_check.stat.exists }}"
375-
controller_reqs: "{{ cifmw_reproducer_controller_user_dir }}/src/github.com/openstack-k8s-operators/ci-framework/common-requirements.txt"
375+
controller_reqs: "{{ cifmw_reproducer_controller_user_dir }}/{{ cifmw_project_dir }}/common-requirements.txt"
376376
remote: https://raw.githubusercontent.com/openstack-k8s-operators/ci-framework/main/common-requirements.txt
377377

378378
- name: Inject most of the cifmw_ parameters passed to the reproducer run

roles/reproducer/vars/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Default repositories we always want to have
33
cifmw_reproducer_default_repositories:
44
- src: "https://github.com/openstack-k8s-operators/ci-framework"
5-
dest: "{{ cifmw_reproducer_controller_user_dir }}/src/github.com/openstack-k8s-operators/ci-framework"
5+
dest: "{{ cifmw_reproducer_controller_user_dir }}/{{ cifmw_project_dir }}"
66
- src: "https://github.com/openstack-k8s-operators/install_yamls"
7-
dest: "{{ cifmw_reproducer_controller_user_dir }}/src/github.com/openstack-k8s-operators/install_yamls"
7+
dest: "{{ cifmw_reproducer_controller_user_dir }}/{{ cifmw_installyamls_repos_relative }}"
88
- src: "https://github.com/openstack-k8s-operators/architecture"
99
dest: "{{ cifmw_reproducer_controller_user_dir }}/src/github.com/openstack-k8s-operators/architecture"
1010

0 commit comments

Comments
 (0)