[SCM] ci-tooling packaging branch, master, updated. 639a2c4595e1a4b6490d52bc5d0378f49004059a

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=639a2c4

The following commit has been merged in the master branch:
commit 639a2c4595e1a4b6490d52bc5d0378f49004059a
Author: Harald Sitter <sitter at kde.org>
Date:   Mon May 4 15:05:05 2015 +0200

    sort packages for qml test such that * > data > dev
    
    since everything but data and dev would usually have dependencies on
    some overlaping parts of the stack installing those packages first should
    give best usage of the partial-autoremove strategy employed to speed up
    the testing by not having to re-install the entire stack for each package.
---
 lib/qml_dependency_verifier.rb                                    | 8 +++++++-
 .../test_missing_modules/backtick_sequence                        | 4 ++--
 .../test_missing_modules/system_sequence                          | 8 ++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/qml_dependency_verifier.rb b/lib/qml_dependency_verifier.rb
index 8f60bd2..6e3a9a3 100644
--- a/lib/qml_dependency_verifier.rb
+++ b/lib/qml_dependency_verifier.rb
@@ -44,7 +44,13 @@ class QMLDependencyVerifier
       packages[binary.binary_package_name] = binary.binary_package_version
     end
     @log.info "Built package hash: #{packages}"
-    packages
+    # Sort packages such that * > -data > -dev to make time saved from
+    # partial-autoremove most likely.
+    packages.sort_by do |package, _version|
+      next 2 if package.end_with?('-dev')
+      next 1 if package.end_with?('-data')
+      0
+    end.to_h
   end
 
   def add_ppa
diff --git a/test/data/test_qml_dependency_verifier/test_missing_modules/backtick_sequence b/test/data/test_qml_dependency_verifier/test_missing_modules/backtick_sequence
index df3b79b..16ca730 100644
--- a/test/data/test_qml_dependency_verifier/test_missing_modules/backtick_sequence
+++ b/test/data/test_qml_dependency_verifier/test_missing_modules/backtick_sequence
@@ -1,11 +1,11 @@
 [
 ["dpkg-architecture --query DEB_HOST_ARCH"],
-["dpkg -L kdeplasma-addons-data"],
 ["dpkg -L kwin-addons"],
 ["dpkg -L plasma-dataengines-addons"],
 ["dpkg -L plasma-runners-addons"],
 ["dpkg -L plasma-wallpapers-addons"],
 ["dpkg -L plasma-widget-kimpanel"],
-["dpkg -L plasma-widgets-addons"]
+["dpkg -L plasma-widgets-addons"],
+["dpkg -L kdeplasma-addons-data"]
 ]
  
diff --git a/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence b/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
index 8b91527..26d45a1 100644
--- a/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
+++ b/test/data/test_qml_dependency_verifier/test_missing_modules/system_sequence
@@ -1,7 +1,4 @@
 [
-["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","kdeplasma-addons-data=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
-["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autoremove"],
-["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","kdeplasma-addons-data"],
 ["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","kwin-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
 ["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autoremove"],
 ["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","kwin-addons"],
@@ -20,5 +17,8 @@
 ["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","plasma-widgets-addons=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
 ["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autoremove"],
 ["dpkg -s plasma-framework 2>&1 > /dev/null"],
-["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","plasma-widgets-addons"]
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","plasma-widgets-addons"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","install","kdeplasma-addons-data=4:5.2.1+git20150316.1204+15.04-0ubuntu0"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","--purge","autoremove"],
+["apt-get","-y", "-o", "APT::Get::force-yes=true","-o","Debug::pkgProblemResolver=true","purge","kdeplasma-addons-data"]
 ]

-- 
ci-tooling packaging