David Caro has uploaded a new change for review.
Change subject: Fix for heterogeneus mock versions
......................................................................
Fix for heterogeneus mock versions
Some mock versoins don'r support more than one src-rpm at a time, some don't
support it sequentally without cleaning up the chroot in between.
Change-Id: I43ea054e2b6dc7c03624dc56656fe0c20d4c5147
Signed-off-by: David Caro <dcaro...@redhat.com>
---
M jobs/confs/shell-scripts/mock_build_onlyrpm.sh
1 file changed, 34 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/24/36124/1
diff --git a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
index 2183f12..68452e5 100644
--- a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
+++ b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh
@@ -87,40 +87,43 @@
my_mock+=" --configdir=$WORKSPACE/jenkins/mock_configs"
my_mock+=" --root=$mock_conf"
-## init the chroot
-echo "##### Initializing chroot"
-$my_mock --init
-$my_mock \
- --no-clean \
- --scrub=yum-cache
-
-### Configure extra yum vars
-echo "Configuring custom env variables for repo urls"
-$my_mock \
- --no-clean \
- --shell <<EOF
- mkdir -p /etc/yum/vars
- echo "$distro" > /etc/yum/vars/distro
-EOF
-
-### Install any extra packages if needed
-if [[ -n "$extra_packages" ]]; then
- echo "##### Installing extra dependencies: $extra_packages"
- $my_mock \
- --no-clean \
- --install "${{extra_packages[@]}}"
-fi
-
-### 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//\"/}}")
-
### Build the rpms
echo "##### Building the rpms"
for srcrpm in "$WORKSPACE"/exported-artifacts/*.src.rpm; do
+
+ ## init the chroot
+ echo "##### Initializing chroot for ${{srcrpm##*/}}"
+ $my_mock --init
+ $my_mock \
+ --no-clean \
+ --scrub=yum-cache
+
+ ### Configure extra yum vars
+ echo "Configuring custom env variables for repo urls for ${{srcrpm##*/}}"
+ $my_mock \
+ --no-clean \
+ --shell <<EOF
+ mkdir -p /etc/yum/vars
+ echo "$distro" > /etc/yum/vars/distro
+EOF
+
+ ### Install any extra packages if needed
+ if [[ -n "$extra_packages" ]]; then
+ echo "##### Installing extra dependencies: " \
+ "$extra_packages for ${{srcrpm##*/}}"
+ $my_mock \
+ --no-clean \
+ --install "${{extra_packages[@]}}"
+ fi
+
+ ### 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//\"/}}")
+
echo " Building $srcrpm"
$my_mock \
"${{mock_build_options[@]}}" \
--
To view, visit http://gerrit.ovirt.org/36124
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43ea054e2b6dc7c03624dc56656fe0c20d4c5147
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
