[gjs: 2/4] CI: Resolve conflicts during system upgrade

[Philip Chimento <pchimento src gnome org>]

commit d82df7d8d8262b3cae4110855b2476ee73130aa0
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Jul 21 17:39:39 2018 -0400

    CI: Resolve conflicts during system upgrade
    
    Adding --best --allowerasing ought to prevent any conflicts from
    happening during a normal system upgrade.
    
    [skip ci]
    
    See: #185

 test/extra/do_basic.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/test/extra/do_basic.sh b/test/extra/do_basic.sh
index 581e9c27..30068b28 100755
--- a/test/extra/do_basic.sh
+++ b/test/extra/do_basic.sh
@@ -20,9 +20,9 @@ function do_Install_Dependencies(){
 
     elif [[ $BASE == "fedora" ]]; then
         if [[ $STATIC == *"qemu"* ]]; then
-            dnf -y --nogpgcheck upgrade
+            dnf -y --nogpgcheck upgrade --best --allowerasing
         else
-            dnf -y upgrade
+            dnf -y upgrade --best --allowerasing
         fi
 
         # Base dependencies