Enable the new solver by default in 0.31, 1.21, 2.11, 3.1

Enable the new solver by default and remove the vendor-specific
configuration change in Ubuntu's drop-in.

5 files changed, 11 insertions, 5 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42d1b6a58..8b8535311 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test as root:
     - CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
     - unbuffer ./test/integration/run-tests -q -j 4
 
-test solver3 and gpgv:
+test classic solver and gpgv:
   stage: test
   variables:
     APT_CMAKE_BUILD_OPTIONS: '-DWITH_DOC=OFF -DUSE_NLS=OFF'
@@ -39,7 +39,7 @@ test solver3 and gpgv:
     BUILD_PRE: 'rm /usr/bin/sqv'
   script:
     - CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
-    - unbuffer ./test/integration/run-tests -q -j 4 --solver 3.0 --skip solver3.broken
+    - unbuffer ./test/integration/run-tests -q -j 4 --solver internal
 
 test as user:
   image:
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 2e6b47b11..7ea18782c 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -514,6 +514,10 @@ static void BinarySpecificConfiguration(char const * const Binary)	/*{{{*/
    _config->CndSet("Version::1.5::APT::Get::Update::InteractiveReleaseInfoChanges", true);
    _config->CndSet("Version::2.0::APT::Cmd::Pattern-Only", true);
    _config->CndSet("Version::3.0::Pager", true);
+   _config->CndSet("Version::0.31::APT::Solver", "3.0");
+   _config->CndSet("Version::1.21::APT::Solver", "3.0");
+   _config->CndSet("Version::2.11::APT::Solver", "3.0");
+   _config->CndSet("Version::3.1::APT::Solver", "3.0");
 
    if (isatty(STDIN_FILENO))
       _config->CndSet("Version::2.0::Dpkg::Lock::Timeout", -1);
diff --git a/debian/NEWS b/debian/NEWS
index 7ac58d84a..8cb5916ee 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,5 +1,7 @@
 apt (3.1.10) unstable; urgency=medium
 
+  The new solver is now the default.
+
   The new --cli-version optionr equests a specific CLI version.
 
   The default --cli-version is the current APT version for the apt(8) command
diff --git a/test/integration/run-tests b/test/integration/run-tests
index 9399f28e9..f5f6b6c57 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -2,6 +2,8 @@
 set -e
 
 TESTTORUN=''
+export APT_SOLVER="${APT_SOLVER:-3.0}"
+export APT_SKIP_TEST_FILE="${APT_SKIP_TEST_FILE:-solver3.broken}"
 while [ -n "$1" ]; do
 	if [ "$1" = "-q" ]; then
 		export MSGLEVEL=2
@@ -24,6 +26,7 @@ while [ -n "$1" ]; do
 		shift
 	elif [ "$1" = '--solver' ]; then
 		export APT_SOLVER="$2"
+		unset APT_SKIP_TEST_FILE
 		shift
 	elif [ "$1" = '--skip' ]; then
 		export APT_SKIP_TEST_FILE="$2"
diff --git a/vendor/ubuntu/apt.conf-01-vendor-ubuntu b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
index 64797799a..cc7cb8356 100644
--- a/vendor/ubuntu/apt.conf-01-vendor-ubuntu
+++ b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
@@ -1,9 +1,6 @@
 Acquire::Changelogs::AlwaysOnline "true";
 Acquire::http::User-Agent-Non-Interactive "true";
 
-// Enable the new solver by default for our commands
-binary::apt::APT::Solver "3.0";
-binary::apt-get::APT::Solver "3.0";
 // Allow apt-get to remove manually installed packages for the
 // first phase.
 binary::apt-get::APT::Solver::RemoveManual "true";