diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2014-09-19 07:45:24 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-09-22 10:26:03 +0200 |
| commit | 3e2f89726a90dfe091d7d7d3b558d97469e5d3af (patch) | |
| tree | e4fd7b15ee96e4c17decce88e78d43ff4d44fcf0 /contrib/ci | |
| parent | 954eaa7cfecdfa5515dc455c3ff0732ef746596d (diff) | |
| download | sssd-3e2f89726a90dfe091d7d7d3b558d97469e5d3af.tar.gz sssd-3e2f89726a90dfe091d7d7d3b558d97469e5d3af.tar.xz sssd-3e2f89726a90dfe091d7d7d3b558d97469e5d3af.zip | |
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 <lslebodn@redhat.com>
Reviewed-by: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Diffstat (limited to 'contrib/ci')
| -rwxr-xr-x | contrib/ci/run | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/contrib/ci/run b/contrib/ci/run index 7a00a0a7f..00cf95094 100755 --- a/contrib/ci/run +++ b/contrib/ci/run @@ -156,7 +156,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 @@ -230,11 +232,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 |