Sandro Bonazzola has uploaded a new change for review.
Change subject: jobs: preserve suffix while building in mock
......................................................................
jobs: preserve suffix while building in mock
Preserve the suffix used while building the src.rpm also
when building rpms in mock.
Change-Id: Ie5e4cd292a2c9c8b641ca57e31b80f5a05b81e68
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M jobs/confs/shell-scripts/build_local_srcrpm.sh
M jobs/confs/shell-scripts/mock_build_onlyrpm.sh
2 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/88/31188/1
diff --git a/jobs/confs/shell-scripts/build_local_srcrpm.sh
b/jobs/confs/shell-scripts/build_local_srcrpm.sh
index 5f3ce73..afd4e43 100644
--- a/jobs/confs/shell-scripts/build_local_srcrpm.sh
+++ b/jobs/confs/shell-scripts/build_local_srcrpm.sh
@@ -31,6 +31,7 @@
# Get the release suffix
pushd "$WORKSPACE/$project"
suffix=".$(date -u +%Y%m%d%H%M%S).git$(git rev-parse --short HEAD)"
+echo "export suffix=${suffix}" > "${WORKSPACE}/suffix.sh"
# make sure it's properly clean
git clean -dxf
diff --git a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
index 7fc6abe..1a6f901 100644
--- a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
+++ b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
@@ -37,6 +37,8 @@
extra_env="{env}"
WORKSPACE=$PWD
+### Import variables set at build_local_srcrpm stage
+[ -f "${WORKSPACE}/suffix.sh" ] && source "${WORKSPACE}/suffix.sh"
### Generate the mock configuration
rpmbuild_options=()
--
To view, visit http://gerrit.ovirt.org/31188
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5e4cd292a2c9c8b641ca57e31b80f5a05b81e68
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
