From 5ea7f35c0a00ce66015fc6038051e69d950e56f7 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Tue, 21 Apr 2020 16:10:06 +0100 Subject: [PATCH] Enable promote to unarchive gz archives in addition to bz2 This should enable us to change archive types. Change-Id: Id79a4ece4eb9e658afc75cb653bd5e02c3f47d0d Needed-By: https://review.opendev.org/#/c/715028/ --- playbooks/api-jobs/promote.yaml | 6 +++++- playbooks/service-types/promote.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/playbooks/api-jobs/promote.yaml b/playbooks/api-jobs/promote.yaml index ecf510016c..7ebc9b13ce 100644 --- a/playbooks/api-jobs/promote.yaml +++ b/playbooks/api-jobs/promote.yaml @@ -21,8 +21,12 @@ path: "{{ zuul.executor.work_root }}/docs" state: directory - name: Extract docs archive + vars: + findme: + - "{{ zuul.executor.work_root }}/docs-html.tar.bz2" + - "{{ zuul.executor.work_root }}/docs-html.tar.gz" unarchive: - src: "{{ zuul.executor.work_root }}/docs-html.tar.bz2" + src: "{{ lookup('first_found', findme) }}" dest: "{{ zuul.executor.work_root }}/docs" - name: Write root_marker file include_role: diff --git a/playbooks/service-types/promote.yaml b/playbooks/service-types/promote.yaml index d1cb9f476a..6725ee9f9c 100644 --- a/playbooks/service-types/promote.yaml +++ b/playbooks/service-types/promote.yaml @@ -23,8 +23,12 @@ path: "{{ zuul.executor.work_root }}/docs" state: directory - name: Extract docs archive + vars: + findme: + - "{{ zuul.executor.work_root }}/docs-html.tar.bz2" + - "{{ zuul.executor.work_root }}/docs-html.tar.gz" unarchive: - src: "{{ zuul.executor.work_root }}/docs-html.tar.bz2" + src: "{{ lookup('first_found', findme) }}" dest: "{{ zuul.executor.work_root }}/docs" - name: Set target directory if master when: "zuul.branch == 'master'"