diff --git a/roles/charm-publish/tasks/publish.yaml b/roles/charm-publish/tasks/publish.yaml index e889e63e..423f77f8 100644 --- a/roles/charm-publish/tasks/publish.yaml +++ b/roles/charm-publish/tasks/publish.yaml @@ -19,24 +19,21 @@ include_role: name: ensure-docker - - name: Set project absolute path - set_fact: - project_abs: "{{ zuul.executor.work_root }}/{{ zuul.project.src_dir }}" - - name: Create charm destination folder file: - path: "{{ project_abs }}/{{ charm_build_name }}" + path: "{{ zuul.project.src_dir }}/{{ charm_build_name }}" state: directory + mode: "0755" - name: Decompress charm unarchive: - src: "{{ project_abs }}/{{ charm_build_name }}.charm" - dest: "{{ project_abs }}/{{ charm_build_name }}" + src: "{{ zuul.project.src_dir }}/{{ charm_build_name }}.charm" + dest: "{{ zuul.project.src_dir }}/{{ charm_build_name }}" - name: Upload oci-image to charmhub register: upload_oci_image_output vars: - metadata: "{{ lookup('file', project_abs + '/' + charm_build_name + '/metadata.yaml') | from_yaml }}" + metadata: "{{ lookup('file', zuul.executor.work_root + '/' + zuul.project.src_dir + '/' + charm_build_name + '/metadata.yaml') | from_yaml }}" args: executable: /bin/bash shell: |