Browse Source

Merge "use include_tasks instead of include"

Zuul 7 months ago
parent
commit
1b14f522d4
3 changed files with 10 additions and 10 deletions
  1. 6
    6
      tasks/main.yml
  2. 1
    1
      tasks/repo_build_prepare.yml
  3. 3
    3
      tests/test.yml

+ 6
- 6
tasks/main.yml View File

@@ -24,11 +24,11 @@
24 24
   tags:
25 25
     - always
26 26
 
27
-- include: repo_build_install.yml
27
+- include_tasks: repo_build_install.yml
28 28
   tags:
29 29
     - repo-build-install
30 30
 
31
-- include: repo_build_prepare.yml
31
+- include_tasks: repo_build_prepare.yml
32 32
   tags:
33 33
     - always
34 34
 
@@ -39,20 +39,20 @@
39 39
   tags:
40 40
     - always
41 41
 
42
-- include: repo_build_wheels.yml
42
+- include_tasks: repo_build_wheels.yml
43 43
   when:
44 44
     - ansible_local['openstack_ansible']['repo_build']['need_wheel_build'] | bool
45 45
   tags:
46 46
     - repo-build-wheels
47 47
 
48
-- include: repo_build_venvs.yml
48
+- include_tasks: repo_build_venvs.yml
49 49
   tags:
50 50
     - repo-build-venvs
51 51
 
52
-- include: repo_build_index.yml
52
+- include_tasks: repo_build_index.yml
53 53
   tags:
54 54
     - repo-build-index
55 55
 
56 56
 # Synchronize all built packages back to the repo master
57
-- include: repo_package_sync.yml
57
+- include_tasks: repo_package_sync.yml
58 58
   when: inventory_hostname != groups['repo_all'][0]

+ 1
- 1
tasks/repo_build_prepare.yml View File

@@ -44,7 +44,7 @@
44 44
     dest: "{{ repo_build_release_path }}/requirements.txt"
45 45
   register: _wheel_build_requirements
46 46
 
47
-- include: repo_clone_git.yml
47
+- include_tasks: repo_clone_git.yml
48 48
   when:
49 49
     - (repo_build_git_reclone | bool) or
50 50
       (_wheel_build_requirements | changed)

+ 3
- 3
tests/test.yml View File

@@ -14,10 +14,10 @@
14 14
 # limitations under the License.
15 15
 
16 16
 # Prepare the host
17
-- include: common/test-setup-host.yml
17
+- import_playbook: common/test-setup-host.yml
18 18
 
19 19
 # Install repo server
20
-- include: test-install-server.yml
20
+- import_playbook: test-install-server.yml
21 21
 
22 22
 # Build repo
23
-- include: test-repo-build.yml
23
+- import_playbook: test-repo-build.yml

Loading…
Cancel
Save