#4156 CI: Drop usage of unnecessary copr repo for mock
Merged 4 years ago by pbrezina. Opened 4 years ago by lslebodn.
SSSD/ lslebodn/sssd ci_mock_config  into  master

file modified
+1 -48
@@ -160,53 +160,6 @@ 

      fi

  }

  

- # Execute mock_privileged with extra chroot configuration added.

- # Args: chroot [mock_arg...]

- # Input: extra configuration

- function mock_privileged_conf()

- {

-     declare -r chroot="$1"; shift

-     declare conf_dir

- 

-     conf_dir=`mktemp --tmpdir --directory mock-config.XXXXXXXX`

-     trap 'trap - RETURN; rm -R "$conf_dir";' RETURN

-     # Preserve timestamps to avoid unnecessary cache rebuilds

-     cp -r --preserve=timestamps /etc/mock/* "$conf_dir"/

-     cat >> "${conf_dir}/${chroot}.cfg"

-     touch --reference="/etc/mock/${chroot}.cfg" "${conf_dir}/${chroot}.cfg"

-     mock_privileged --configdir="$conf_dir" --root="$chroot" "$@"

- }

- 

- # Execute mock_privileged with dependency package source configuration added.

- # Args: chroot [mock_arg...]

- function mock_privileged_deps()

- {

-     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

-         repo='fedora-$releasever-$basearch'

-     elif [[ "$chroot" =~ epel-([0-9]+) ]]; then

-         repo="epel-${BASH_REMATCH[1]}-\$basearch"

-     else

-         echo "Unknown chroot config: $chroot" >&2

-         exit 1

-     fi

- 

-     mock_privileged_conf "$chroot" "$@" <<<"

- config_opts['yum.conf'] += '''

- [sssd-deps]

- name=Extra SSSD dependencies

- baseurl=http://copr-be.cloud.fedoraproject.org/results/lslebodn/sssd-deps/$repo/

- skip_if_unavailable=true

- gpgcheck=0

- enabled=1

- '''

- "

- }

- 

  # Run debug build checks.

  function build_debug()

  {
@@ -272,7 +225,7 @@ 

  

          if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then

              stage make-srpm     env -u CFLAGS -- make srpm

-             stage mock-build    mock_privileged_deps "default" \

+             stage mock-build    mock_privileged  \

                                       --resultdir ci-mock-result \

                                       rpmbuild/SRPMS/*.src.rpm

          fi

rebased onto c794d28

4 years ago

Thanks, I rebase it on top of current master and I'm running CI tests against it.

Commit d028df0 fixes this pull-request

Pull-Request has been merged by pbrezina

4 years ago
  • master
    • d028df0 - CI: Drop usage of unnecessary copr repo for mock
  • sssd-1-16
    • b76d220 - CI: Drop usage of unnecessary copr repo for mock
Metadata