From d04132cc6deb4dbefd88d8ef7be9b3b59eb9b6bc Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Apr 11 2017 11:21:45 +0000
Subject: [builder] Store mock configs into resultdir/configs


---

diff --git a/builder/TODO b/builder/TODO
index eee15fd..1fbec81 100644
--- a/builder/TODO
+++ b/builder/TODO
@@ -1,8 +1,6 @@
 To have 1:1 replacement with current backend->builder build mechanism, we need
 to have those fixed:
 
-    - collect mock configuration into resultdir/configs so copr backend knows
-      where to download them
     - add support for custom mock configs
     - implement opt-out/in "Other options" from "New Build" form:
         - Enable internet access during this build
diff --git a/builder/copr-builder b/builder/copr-builder
index 7619975..33ea5dd 100755
--- a/builder/copr-builder
+++ b/builder/copr-builder
@@ -179,11 +179,18 @@ set -- "$@" --release rhel-7.2
 
 cd "$opt_workdir"
 
-info "Downloading mock config from frontend"
+info "Copying system mock configuration"
+configs_dir=$opt_resultdir/configs
+mkdir -p "$configs_dir"
+cp /etc/mock/site-defaults.cfg "$configs_dir"
+cp "/etc/mock/$opt_chroot.cfg" "$configs_dir"
+
+info "Downloading changed mock config from frontend"
 if $opt_download_mock_config; then
     copr --config "$opt_config" mock-config "$opt_copr" "$opt_chroot" \
-        > "$opt_chroot".cfg
+        > "$configs_dir"/changed.cfg
 fi
+mock+=(--configdir "$configs_dir" -r changed)
 
 info "Obtain sources from dist-git"
 stdout_wrap rpkg "$@" clone -a "$opt_copr/$opt_package" pkg-git
@@ -194,7 +201,7 @@ stdout_wrap rpkg "$@" --module-name "$opt_copr/$opt_package" sources
 )
 
 info "Generate SRPM in mock $opt_chroot"
-stdout_wrap "${mock[@]}" -r ./"$opt_chroot".cfg \
+stdout_wrap "${mock[@]}" \
     --buildsrpm \
     --spec pkg-git/"$opt_package".spec \
     --sources pkg-git \
@@ -202,7 +209,7 @@ stdout_wrap "${mock[@]}" -r ./"$opt_chroot".cfg \
     --no-cleanup-after
 
 info "Generate RPM in cached mock chroot"
-stdout_wrap "${mock[@]}" -r ./"$opt_chroot".cfg \
+stdout_wrap "${mock[@]}" \
     --rebuild intermediate-srpm/"$opt_package"*.src.rpm \
     --resultdir "$opt_resultdir" \
     --no-clean