summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-18 10:59:07 +0000
committerGerrit Code Review <review@openstack.org>2018-12-18 10:59:07 +0000
commit6cfcecf157e854c1214c7e1d858c4d7d1c9b5e6b (patch)
tree1a1181f7705fba42b049e31a2353f212c000375b
parent4bf81a57e456bda039216e2f4d619f163d37f022 (diff)
parent8634532731789515776a8acde0b0e0b6326795ee (diff)
Merge "Fix ansible deprecation warnings"
-rw-r--r--tasks/repo_build_prepare.yml2
-rw-r--r--templates/manifest.in.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/tasks/repo_build_prepare.yml b/tasks/repo_build_prepare.yml
index ab68b4a..5c28b93 100644
--- a/tasks/repo_build_prepare.yml
+++ b/tasks/repo_build_prepare.yml
@@ -43,7 +43,7 @@
43- include_tasks: repo_clone_git.yml 43- include_tasks: repo_clone_git.yml
44 when: 44 when:
45 - (repo_build_git_reclone | bool) or 45 - (repo_build_git_reclone | bool) or
46 (_wheel_build_requirements | changed) 46 (_wheel_build_requirements is changed)
47 tags: 47 tags:
48 - repo-clone-repos 48 - repo-clone-repos
49 49
diff --git a/templates/manifest.in.j2 b/templates/manifest.in.j2
index 14af494..ae08516 100644
--- a/templates/manifest.in.j2
+++ b/templates/manifest.in.j2
@@ -1,7 +1,7 @@
1{% for item in manifest_items['files'] %} 1{% for item in manifest_items['files'] %}
2{% set item_cleaned = item['path'] | regex_replace(repo_build_base_path ~ "/", '') %} 2{% set item_cleaned = item['path'] | regex_replace(repo_build_base_path ~ "/", '') %}
3{% set item_basename = item_cleaned | basename %} 3{% set item_basename = item_cleaned | basename %}
4{% if item_cleaned | match(repo_build_release_version_path + "/.*/.*\.whl") %} 4{% if item_cleaned is match(repo_build_release_version_path + "/.*/.*\.whl") %}
5{{ repo_build_pool_dir | regex_replace(repo_build_base_path ~ "/", '') }}/{{ item_basename.split('-')[0] }}/{{ item_basename | lower }} 5{{ repo_build_pool_dir | regex_replace(repo_build_base_path ~ "/", '') }}/{{ item_basename.split('-')[0] }}/{{ item_basename | lower }}
6{{ item_cleaned | lower }} 6{{ item_cleaned | lower }}
7{% else %} 7{% else %}