>From 4f5ee1aa3fb114bcca455f774c7ad878df46f36a Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 19 Sep 2014 07:45:24 +0200 Subject: [PATCH] CI: Use default config for mock build The mock config with name default is usually symbolic link to the configuration file of local architecture. The side effect of this patch is that we will not try to rebuild on old architectures src.rpm for new architectures(fedora). It caused issues with mock tmpfs plugin. Resolves: https://fedorahosted.org/sssd/ticket/2441 Signed-off-by: Lukas Slebodnik --- contrib/ci/run | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/contrib/ci/run b/contrib/ci/run index 9864818c6e27113a875abff8d83aa05eb5f592ca..37c3d63990e35fd31cff41aec22a520ba440c314 100755 --- a/contrib/ci/run +++ b/contrib/ci/run @@ -155,7 +155,9 @@ function mock_privileged_conf() # Args: chroot [mock_arg...] function mock_privileged_deps() { - declare -r chroot="$1"; shift + declare -r chroot_name="$1"; shift + declare -r config=$(basename $(readlink -f "/etc/mock/${chroot_name}.cfg")) + declare -r chroot="${config%.cfg}" declare repo if [[ "$chroot" == fedora-* ]]; then @@ -226,11 +228,8 @@ function build_debug() if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then stage make-srpm env -u CFLAGS -- make srpm - stage mock-epel6 mock_privileged_deps "epel-6-$ARCH" \ - --resultdir ci-mock-result-epel6 \ - rpmbuild/SRPMS/*.src.rpm - stage mock-fedora20 mock_privileged_deps "fedora-20-$ARCH" \ - --resultdir ci-mock-result-fedora20 \ + stage mock-build mock_privileged_deps "default" \ + --resultdir ci-mock-result \ rpmbuild/SRPMS/*.src.rpm fi fi -- 2.1.0