From e4c5ab4c6ebf33267d4a4cdf7ecff35465899167 Mon Sep 17 00:00:00 2001 From: Andreas Scheuring Date: Tue, 18 Jul 2017 09:06:06 +0200 Subject: [PATCH] Sync repos to correct location on repo master The repo container sync task synchronises the following directory to a wrong location. pools ----- Wrongly created dir on target: /var/www/repo/{{ repo_build_os_distro_version }} Fixed dir on target: /var/www/repo/pools/{{ repo_build_os_distro_version }} As the links and other directories are synced successfuly, they point to invalid locations which will cause the repo build on the existing repo master to fail. venvs ----- Wrongly created dir on target: /var/www/repo/{{ repo_build_os_distro_version }} Fixed dir on target: /var/www/repo/venvs/{{ repo_build_release_tag }}/{{ repo_build_os_distro_version }} os-releases ----------- Wrongly created dir on target: /var/www/repo/{{ repo_build_os_distro_version }} Fixed dir on target: /var/www/repo/os-releases/{{ repo_build_release_tag }}/{{ repo_build_os_distro_version }} Change-Id: I9e5902ec91afbb2805663eb5678fc9b2b31f23b2 Closes-Bug: #1704936 --- tasks/repo_package_sync.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tasks/repo_package_sync.yml b/tasks/repo_package_sync.yml index a87347a..52ebce0 100644 --- a/tasks/repo_package_sync.yml +++ b/tasks/repo_package_sync.yml @@ -21,13 +21,17 @@ --delay-updates -F --compress --archive --rsh 'ssh -l {{ repo_build_service_user_name }} -o stricthostkeychecking=no' --out-format='<>%i %n%L' - {{ item }} - {{ repo_build_service_user_name }}@{{ hostvars[groups['repo_all'][0]]['ansible_host'] }}:{{ repo_build_base_path }} + {{ item.src }} + {{ repo_build_service_user_name }}@{{ hostvars[groups['repo_all'][0]]['ansible_host'] }}:{{ item.dest }} with_items: - - "{{ repo_build_global_links_path }}" - - "{{ repo_build_release_path }}" - - "{{ repo_build_pool_dir }}" - - "{{ repo_build_venv_dir }}" + - src: "{{ repo_build_global_links_path }}" + dest: "{{ repo_build_base_path }}" + - src: "{{ repo_build_release_path }}" + dest: "{{ repo_build_base_path }}/{{ repo_build_release_version_path }}" + - src: "{{ repo_build_pool_dir }}" + dest: "{{ repo_build_base_path }}/pools" + - src: "{{ repo_build_venv_dir }}" + dest: "{{ repo_build_base_path }}/venvs/{{ repo_build_release_tag }}" become: true become_user: "{{ repo_build_service_user_name }}" changed_when: false