openafs-rpm-package-build: tar results

It turns out there are many issues doing a recursive download from our
log servers.  Tar the results so we can pass it through a single file,
and extract that file in the publish jobs.

Change-Id: I2b54c061ae3563a8244a39d08e2fe49c2f885d2e
This commit is contained in:
Ian Wienand 2020-06-05 11:38:27 +10:00
parent dc22e82aa1
commit 2fcfa7362b
2 changed files with 30 additions and 9 deletions

View File

@ -12,30 +12,42 @@
name: download-artifact
vars:
download_artifact_api: "https://zuul.opendev.org/api/tenant/{{ zuul.tenant }}"
download_artifact_type: rpm
download_artifact_type: rpm.tar.gz
download_artifact_pipeline: gate
download_artifact_job: openafs-rpm-package-build-centos-7-x86
download_artifact_directory: '{{ zuul.executor.work_root }}/artifacts/centos7'
download_artifact_recurse: True
download_artifact_directory: '{{ zuul.executor.work_root }}'
- name: Extract centos 7 x86
unarchive:
src: '{{ zuul.executor.work_root }}/openafs-rpms.tar.gz'
dest: '{{ zuul.executor.work_root }}/artifacts/centos7'
- name: Download centos 8 x86 artifact
include_role:
name: download-artifact
vars:
download_artifact_api: "https://zuul.opendev.org/api/tenant/{{ zuul.tenant }}"
download_artifact_type: rpm
download_artifact_type: rpm.tar.gz
download_artifact_pipeline: gate
download_artifact_job: openafs-rpm-package-build-centos-8-x86
download_artifact_directory: '{{ zuul.executor.work_root }}/artifacts/centos8'
download_artifact_recurse: True
download_artifact_directory: '{{ zuul.executor.work_root }}'
- name: Extract centos 8 x86
unarchive:
src: '{{ zuul.executor.work_root }}/openafs-rpms.tar.gz'
dest: '{{ zuul.executor.work_root }}/artifacts/centos8'
- name: Download centos 8 arm64 artifact
include_role:
name: download-artifact
vars:
download_artifact_api: "https://zuul.opendev.org/api/tenant/{{ zuul.tenant }}"
download_artifact_type: rpm
download_artifact_type: rpm.tar.gz
download_artifact_pipeline: gate
download_artifact_job: openafs-rpm-package-build-centos-8-arm64
download_artifact_directory: '{{ zuul.executor.work_root }}/artifacts/centos8'
download_artifact_recurse: True
download_artifact_directory: '{{ zuul.executor.work_root }}'
- name: Extract centos 8 arm64
unarchive:
src: '{{ zuul.executor.work_root }}/openafs-rpms.tar.gz'
dest: '{{ zuul.executor.work_root }}/artifacts/centos8'

View File

@ -47,6 +47,10 @@
# create final repo
createrepo ~/rpmbuild/RPMS/{{ ansible_architecture }}
# tar result
pushd ~/rpmbuild
tar cvzf openafs-rpms.tar.gz RPMS
- name: Copy built rpms
synchronize:
src: '{{ ansible_user_dir }}/rpmbuild/'
@ -55,6 +59,7 @@
rsync_opts:
- --include=/RPMS/**
- --include=/SRPMS/**
- --include=openafs-rpms.tar.gz
- --include=*/
- --exclude=*
- --prune-empty-dirs
@ -72,4 +77,8 @@
url: SRPMS
metadata:
type: srpm
- name: rpms-tar
url: openafs-rpms.tar.gz
metadata:
type: rpm.tar.gz