From 3270c0b7508823170eee336172a89ce93c4f5ebd Mon Sep 17 00:00:00 2001 From: "Anderson, Craig (ca846m)" Date: Mon, 22 Feb 2021 10:12:40 -0800 Subject: [PATCH] Allow makefile directory to be overridden Change-Id: I38611e6e8c589329fd0cddafc56234df1840236d --- .zuul.yaml | 1 + playbooks/airship-images-build.yaml | 2 +- playbooks/airship-images-publish.yaml | 2 +- playbooks/airship-images-test.yaml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index da17f3a..352bfe1 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -20,6 +20,7 @@ http: "" https: "" noproxy: "" + makefile_chdir: "{{ zuul.project.src_dir }}" image_config_dir: config check: jobs: diff --git a/playbooks/airship-images-build.yaml b/playbooks/airship-images-build.yaml index 759fbb3..9ff9b9c 100644 --- a/playbooks/airship-images-build.yaml +++ b/playbooks/airship-images-build.yaml @@ -35,7 +35,7 @@ - name: Publish images block: - make: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ makefile_chdir }}" target: "images" params: COMMIT: "{{ zuul.newrev | default('') }}" diff --git a/playbooks/airship-images-publish.yaml b/playbooks/airship-images-publish.yaml index 27fd1b1..9f50928 100644 --- a/playbooks/airship-images-publish.yaml +++ b/playbooks/airship-images-publish.yaml @@ -39,7 +39,7 @@ password: "{{ airship_images_quay_creds.password }}" registry_url: "{{ docker_registry }}" - make: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ makefile_chdir }}" target: "images" params: COMMIT: "{{ zuul.newrev | default('') }}" diff --git a/playbooks/airship-images-test.yaml b/playbooks/airship-images-test.yaml index 19fdca6..5830809 100644 --- a/playbooks/airship-images-test.yaml +++ b/playbooks/airship-images-test.yaml @@ -18,7 +18,7 @@ block: - name: "make tests" make: - chdir: "{{ zuul.project.src_dir }}" + chdir: "{{ makefile_chdir }}" target: tests - name: install libvirt include_role: