build-sid-toolbox: Eliminate intermediate container image

[bin.git] / build-devmock

diff --git a/build-devmock b/build-devmock
index 410ac32c9f14ab5c9dd4f0465e036210d5e28f59..03f2f3c09109b1a044b595b4e6d38bdcb618a42c 100755 (executable)
--- a/build-devmock
+++ b/build-devmock
@@ -8,11 +8,11 @@ $MOCK --clean
 $MOCK -i $(sed -n '/^BuildRequires:/ {s/^.*: //; s/>=.*$//; s/%{.*}//; p}' ~/upstream/cockpit/tools/cockpit.spec) \
     npm fontconfig git valgrind chromium-headless \
     libvirt-daemon-kvm libvirt-client python3-libvirt \
-    virt-viewer libguestfs-tools-c \
+    virt-viewer libappstream-glib \
     expect python3-pycodestyle python3-pyflakes \
     fedpkg /usr/bin/oc /usr/bin/genisoimage \
     man-pages socat wget genisoimage vim-enhanced \
-    ansible standard-test-roles rsync
+    ansible standard-test-roles rsync waiverdb-cli
 
 # interactive shell sessions work as user martin, not builder
 $MOCK --unpriv --copyin /dev/stdin /builddir/.bashrc <<EOF
@@ -32,8 +32,11 @@ $MOCK --chroot -- ln -sf /home /var/home
 
 # install rhpkg
 $MOCK -i ~martin/Dokumente/Arbeit/RedHat/redhat-internal-cert-install-0.1-7.el7.csb.noarch.rpm
-$MOCK --chroot --cwd=/etc/yum.repos.d -- 'echo >> /etc/dnf/dnf.conf; curl --location https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-fedora.repo >> /etc/dnf/dnf.conf'
-$MOCK -i rhpkg
+$MOCK --chroot -- 'echo >> /etc/dnf/dnf.conf; curl --location https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-fedora.repo >> /etc/dnf/dnf.conf; dnf install -y rhpkg'
+
+# set up waiverdb
+mock --chroot -- 'printf "[waiverdb]\nauth_method=Kerberos\nresultsdb_api_url=https://resultsdb-api.engineering.redhat.com/api/v2.0\napi_url=https://waiverdb.engineering.redhat.com/api/v1.0\nkrb_principal=HTTP/waiverdb.engineering.redhat.com@REDHAT.COM\n" > /etc/waiverdb/client.conf'
+mock --chroot -- 'sed -i "/\[libdefaults\]/ s/$/\n    dns_canonicalize_hostname = false/" /etc/krb5.conf'
 
 # ssh looks at passwd, not $HOME
 $MOCK --chroot --unpriv -- rm -rf /builddir/.ssh