David Caro has uploaded a new change for review.
Change subject: Fixed issue introduced by #35238
......................................................................
Fixed issue introduced by #35238
Now all the strings have extra single quotes, and the script parses the config
to get some values, adapted.
Change-Id: Ie7a6ac35940ab2d89a748e0f5da9d68e2e39a3cd
Signed-off-by: David Caro <dcaro...@redhat.com>
---
M jobs/confs/shell-scripts/build_mock_srcrpm.sh
M jobs/confs/shell-scripts/mock_build_onlyrpm.sh
2 files changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/00/35500/1
diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm.sh
b/jobs/confs/shell-scripts/build_mock_srcrpm.sh
index 3b80805..5b9de55 100644
--- a/jobs/confs/shell-scripts/build_mock_srcrpm.sh
+++ b/jobs/confs/shell-scripts/build_mock_srcrpm.sh
@@ -123,6 +123,7 @@
### Set custom dist from mock config into rpmmacros for manual builds
rpm_dist="$(grep 'config_opts\["dist"\]' \
$WORKSPACE/jenkins/mock_configs/$mock_conf.cfg)"
+rpm_dist="${{rpm_dist//[\'\"]/}}"
rpm_dist=.${{rpm_dist#*=}}
$my_mock \
--no-clean \
diff --git a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
index 083d6df..2c52ebe 100644
--- a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
+++ b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
@@ -114,6 +114,7 @@
### Set custom dist from mock config into rpmmacros for manual builds
rpm_dist="$(grep 'config_opts\["dist"\]' \
$WORKSPACE/jenkins/mock_configs/$mock_conf.cfg)"
+rpm_dist="${{rpm_dist//[\'\"]/}}"
rpm_dist=${{rpm_dist#*=}}
[[ -n $rpm_dist ]] && mock_build_options+=("--define" "dist
.${{rpm_dist//\"/}}")
--
To view, visit http://gerrit.ovirt.org/35500
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7a6ac35940ab2d89a748e0f5da9d68e2e39a3cd
Gerrit-PatchSet: 1
Gerrit-Project: jenkins
Gerrit-Branch: master
Gerrit-Owner: David Caro <dcaro...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
