libguestfs: Use python3 for builds and the Python PIP package.

[goaljobs-goals.git] / config.ml

diff --git a/config.ml b/config.ml
index dfa9c73..16b3502 100644 (file)
--- a/config.ml
+++ b/config.ml
@@ -17,8 +17,14 @@ let fedora_specfile pkg branch =
 (* libguestfs *)
 let libguestfs_query_mins = 60
 
+let websites_repo =
+  sprintf "%s/d/websites" (Sys.getenv "HOME")
 let libguestfs_website_repo =
-  sprintf "%s/d/websites/libguestfs" (Sys.getenv "HOME")
+  sprintf "%s/libguestfs" websites_repo
+let libguestfs_builder_repo =
+  sprintf "%s/libguestfs-builder" websites_repo
+let libguestfs_download_repo =
+  sprintf "%s/libguestfs-download" websites_repo
 
 let libguestfs_localconfigure source =
   let configure =
@@ -33,13 +39,14 @@ let libguestfs_localconfigure source =
 # https://bugzilla.redhat.com/show_bug.cgi?id=1316206
 
 %s \\
+  PYTHON=/usr/bin/python3 \\
   --prefix /usr \\
   --disable-static \\
   --with-default-backend=libvirt \\
-  --enable-werror \\
   --enable-gtk-doc \\
   --disable-golang \\
   --disable-erlang \\
+  --with-virt-v2v-nbdkit-python-plugin=python3 \\
   -C \\
   \"$@\"
 " configure
@@ -90,11 +97,27 @@ export SKIP_TEST_BTRFS_IMAGE_0=1
 # Yawn, btrfs broken again. RHBZ#1372037
 export SKIP_TEST_BTRFS_DEVICES_SH=1
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1431454
-export SKIP_TEST_V2V_I_OVA_SH=1
+# Kernel takes lots of RAM for virtio-scsi RHBZ#1478201
+export SKIP_TEST_255_DISKS_SH=1
+export SKIP_TEST_ADD_LOTS_OF_DISKS_SH=1
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1433577
-export SKIP_TEST_RELABEL_PL=1
+# virtio-9p modules don't all get loaded RHBZ#1499896
+export SKIP_TEST_9P_SH=1
+
+# These tests are broken by libvirt not supporting qemu >= 2.10 locking.
+# REMOVE THIS when fixed.
+export SKIP_TEST820RHBZ912499_PY=1
+
+# ntfsclone is broken in Rawhide (RHBZ#1601146).
+export SKIP_TEST_NTFSCLONE_SH=1
+
+# Kernel broken.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1657200
+export SKIP_TEST_BIG_DIRS_PL=1
+
+# Setting hostname on Ubuntu 18.04 is broken.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1658307
+export SKIP_TEST_SETTINGS_UBUNTU_18_04_SH=1
 " ^
     match supermin with
     | None -> ""