[SCM] ci-tooling packaging branch, master, updated. 89cf10e6c9c3e4a3d5287b506a769049cc721fe1

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 265889f0fc30543ac0e5bc43ffbedfa69e39d246
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 19 10:46:12 2015 +0200

    add new extra_architectures descriptor to KCI and set armhf as such a thing
    
    extra_architectures are not built in all contexts, they have no imagers,
    they are essentially opt-in architectures
    
    also add a new all_architectures helper that be able to iterate all
---
 data/kci.yaml    |  2 ++
 lib/kci.rb       | 29 ++++++++++++++++++++++++++++-
 test/test_kci.rb |  8 ++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/data/kci.yaml b/data/kci.yaml
index 1c2a449..8a8940d 100644
--- a/data/kci.yaml
+++ b/data/kci.yaml
@@ -4,6 +4,8 @@ series:
 architectures:
   - amd64
   - i386
+extra_architectures:
+  - armhf
 types:
   - stable
   - unstable
diff --git a/lib/kci.rb b/lib/kci.rb
index 8fe466c..f56d615 100644
--- a/lib/kci.rb
+++ b/lib/kci.rb
@@ -19,11 +19,38 @@ module KCI
     @latest_series ||= series(sort: :descending).keys.first
   end
 
-  # @return [Array<String>] architectues to integrate
+  # Core architectures. These are always enabled architectures that also get
+  # ISOs generated and so forth.
+  # This for example are general purpose architectures such as i386/amd64.
+  # @see .extra_architectures
+  # @return [Array<String>] architectures to integrate
   def self.architectures
     data['architectures']
   end
 
+  # Extra architectures. They differ from core architectures in that they are
+  # not automatically enabled and might not be used or useful in all contexts.
+  # This for example are special architectures such as ARM.
+  # @see .all_architectures
+  # @return [Array<String>] architectures to only integrated when explicitly
+  #   enabled within the context of a build.
+  def self.extra_architectures
+    data['extra_architectures']
+  end
+
+  # Convenience function to combine all known architectures. Generally when
+  # creating scopes (e.g. when creating jenkins jobs) one wants to use the
+  # specific readers as to either use the core architectures or extras or a
+  # suitable mix of both. When read-iterating on something that includes the
+  # architecture value all_architectures is the way to go to cover all possible
+  # architectures.
+  # @see .architectures
+  # @see .extra_architectures
+  # @return [Array<String>] all architectures
+  def self.all_architectures
+    architectures + extra_architectures
+  end
+
   # @return [Array<String>] types to integrate (stable/unstable)
   def self.types
     data['types']
diff --git a/test/test_kci.rb b/test/test_kci.rb
index dfea2e1..140c5aa 100644
--- a/test/test_kci.rb
+++ b/test/test_kci.rb
@@ -18,6 +18,14 @@ class KCITest < TestCase
     assert_equal_collection(%w(amd64 i386), KCI.architectures)
   end
 
+  def test_extra_architectures
+    assert_equal_collection(%w(armhf), KCI.extra_architectures)
+  end
+
+  def test_all_architectures
+    assert_equal_collection(%w(amd64 i386 armhf), KCI.all_architectures)
+  end
+
   def test_series
     assert_equal_collection(%w(wily vivid), KCI.series.keys)
     assert_equal_collection(%w(15.10 15.04), KCI.series.values)

-- 
ci-tooling packaging