Sandro Bonazzola has uploaded a new change for review. Change subject: refactor host-deploy hack ......................................................................
refactor host-deploy hack refactor host-deploy hack to be less ugly Related-To: https://fedorahosted.org/ovirt/ticket/315 Change-Id: I0577f47ebd589c7a1878cfeb2f8c4a02fef498d7 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M jobs/confs/shell-scripts/build_mock_srcrpm.sh M jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml 2 files changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/60/40760/1 diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm.sh b/jobs/confs/shell-scripts/build_mock_srcrpm.sh index 0e53979..8b09b48 100644 --- a/jobs/confs/shell-scripts/build_mock_srcrpm.sh +++ b/jobs/confs/shell-scripts/build_mock_srcrpm.sh @@ -38,6 +38,10 @@ # # cherry-pick # List of refspecs to cherry-pick before creating the src.rpm +# +# extra-make-targets +# extra make targets to be built +# distro="{distro}" arch="{arch}" @@ -54,6 +58,7 @@ extra_repos=({extra-repos}) extra_env=({extra-env}) to_cherry_pick=({cherry-pick}) +extra_make_targets=({extra-make-targets}) WORKSPACE=$PWD # Get the release suffix @@ -186,8 +191,12 @@ [[ -x configure ]] && ./configure "${{extra_configure_options[@]}}" make dist -echo "Really ugly hack for the host-deploy job" -make offline-tarball || : + +# Build extra make targets, like offline-tarball for ovirt-host-deploy + +for extra_target in "${{extra_make_targets[@]}}"; do + make "${extra_target}" +done # build src.rpm rpmbuild \ diff --git a/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml index bb62867..790c2f6 100644 --- a/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml @@ -31,5 +31,7 @@ automake autoreconf make + extra-make-targets: | + offline-tarball jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}' -- To view, visit https://gerrit.ovirt.org/40760 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0577f47ebd589c7a1878cfeb2f8c4a02fef498d7 Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
