[SCM] ci-tooling packaging branch, master, updated. 9d3f03d72bf2c779316d900ffcef510ff97020b9

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 9d3f03d72bf2c779316d900ffcef510ff97020b9
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Mar 17 17:35:25 2015 +0100

    Refactor imager
    
    Split out responsibilities into their own methods
    Official repos via new calls
---
 dci/imager.rb | 143 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 71 insertions(+), 72 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 7f5e5f6..059d5c6 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -45,22 +45,22 @@ a4hw1LvfpbOxVBwDdqEFgH6LQI5eXNGwR9Ps3F1KA3yNVI2FKbArVPQ=
 -----END PGP PUBLIC KEY BLOCK-----'
 
 def workarounds
-    system('rm -rf config/bootloaders')
-
-    File.open('config/package-lists/live.list.chroot', 'a') do |f|
-        f.puts('live-config')
-        f.puts('live-config-systemd')
-        f.puts('live-boot')
-        f.puts('live-boot-initramfs-tools')
-    end
-
-    contents = File.read('config/package-lists/desktop.list.chroot')
-    File.open('config/package-lists/desktop.list.chroot', 'w') do |f|
-        contents.gsub!(/plymouth-drm/, '')
-        contents.gsub!(/task-kde-desktop/, '')
-        f.puts(contents)
-    end
-    puts `grep -iR plymouth-drm config/package-lists`
+  system('rm -rf config/bootloaders')
+
+  File.open('config/package-lists/live.list.chroot', 'a') do |f|
+    f.puts('live-config')
+    f.puts('live-config-systemd')
+    f.puts('live-boot')
+    f.puts('live-boot-initramfs-tools')
+  end
+
+  contents = File.read('config/package-lists/desktop.list.chroot')
+  File.open('config/package-lists/desktop.list.chroot', 'w') do |f|
+    contents.gsub!(/plymouth-drm/, '')
+    contents.gsub!(/task-kde-desktop/, '')
+    f.puts(contents)
+  end
+  puts `grep -iR plymouth-drm config/package-lists`
 end
 
 logger = DCILogger.instance
@@ -68,61 +68,60 @@ logger = DCILogger.instance
 Dir.mkdir('build') unless Dir.exist? 'build'
 
 MIRROR = 'http://127.0.0.1:3142/debian'
-
+CLOUDFRONT_MIRROR = 'http://cloudfront.debian.net/debian'
 Dir.chdir('build') do
-    logger.info('Installing some extra utils')
-    dci_run_cmd('apt-get update')
-    system('apt-get -y install live-images live-build live-tools')
-    system('lb clean --purge')
-    system("lb config --config kde-desktop \
-            --distribution #{RELEASE} \
-            -m #{MIRROR} \
-            --debian-installer false \
-            --source false \
-            --security false \
-            --updates false")
-    FileUtils.mkdir_p('config/archives')
-    workarounds
-    packages = []
-    repos = []
-    case FLAVOR
-    when /.*netrunner.*desktop/
-        packages << "debian-plasma5-desktop"
-        packages << "firefox"
-        repos << "deb http://pangea-data.s3.amazonaws.com/dci/plasma/debian #{RELEASE} main"
-        repos << "deb http://pangea-data.s3.amazonaws.com/dci/moz-plasma/debian #{RELEASE} main"
-
-    when /.*netrunner.*cloud/
-        packages << "debian-plasma5-cloud"
-        packages << "firefox"
-        repos << "deb http://pangea-data.s3.amazonaws.com/dci/plasma/debian #{RELEASE} main"
-        repos << "deb http://pangea-data.s3.amazonaws.com/dci/moz-plasma/debian #{RELEASE} main"
-
-        File.write('config/archives/owncloud.pref', OWNCLOUD_PREF)
-
-    when /.*maui.*/
-        # TODO: Implement
-        repos << "deb http://pangea-data.s3.amazonaws.com/dci/maui-desktop/debian #{RELEASE} main"
-    else
-        logger.error("Don't understand the flavor #{FLAVOR}")
-        exit 1
-    end
-
-    packages.each do |package|
-        File.write("config/package-lists/netrunner.list.chroot", package + "
", mode: 'a')
-    end
-
-    File.delete('config/archives/dci.list') if File.exist? 'config/archives/dci.list'
-    repos.each do |repo|
-        logger.info("Adding #{repo} to ISO")
-        File.write('config/archives/dci.list', repo + "
", mode: 'a')
-    end
-
-    File.write('config/archives/dci.key', REPO_KEY)
-
-    FileUtils.mkdir_p('config/includes.chroot/lib/live/config')
-    FileUtils.cp("#{File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))}/data/imager/0090-sddm", "config/includes.chroot/lib/live/config")
-
-    system('lb build')
-
+  logger.info('Installing some extra utils')
+  dci_run_cmd('apt-get update')
+  system('apt-get -y install live-images live-build live-tools')
+  system('lb clean --purge')
+  system("lb config --config kde-desktop \
+  --distribution #{RELEASE} \
+  -m #{MIRROR} \
+  --mirror-bootstrap #{CLOUDFRONT_MIRROR} \
+  --mirror-chroot #{CLOUDFRONT_MIRROR} \
+  --mirror-binary #{CLOUDFRONT_MIRROR} \
+  --debian-installer false \
+  --source false \
+  --security false \
+  --updates false")
+  FileUtils.mkdir_p('config/archives')
+  workarounds
+  packages = []
+  repos = []
+  case FLAVOR
+  when /.*netrunner.*desktop/
+    repos = %w(qt5 frameworks plasma netrunner calamares)
+    packages = %w(netrunner-desktop calamares)
+
+  when /.*netrunner.*cloud/
+    repos = %w(qt5 frameworks plasma netrunner calamares)
+    packages = %w(netrunner-desktop calamares)
+
+    File.write('config/archives/owncloud.pref', OWNCLOUD_PREF)
+
+  when /.*maui.*/
+    repos = %w(qt5 frameworks plasma maui calamares)
+    packages = %w(hawaii-shell)
+  else
+    logger.error("Don't understand the flavor #{FLAVOR}")
+    exit 1
+  end
+
+  packages.each do |package|
+    File.write('config/package-lists/netrunner.list.chroot',
+               package + "
", mode: 'a')
+  end
+
+  File.delete('config/archives/dci.list') if File.exist? 'config/archives/dci.list'
+  repos.each do |repo|
+    logger.info("Adding #{repo} to ISO")
+    File.write('config/archives/dci.list', "deb http://pangea-data.s3.amazonaws.com/dci/#{repo}/debian #{RELEASE} main" + "
", mode: 'a')
+  end
+
+  File.write('config/archives/dci.key', REPO_KEY)
+
+  FileUtils.mkdir_p('config/includes.chroot/lib/live/config')
+  FileUtils.cp("#{File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__))))}/data/imager/0090-sddm", "config/includes.chroot/lib/live/config")
+
+  system('lb build')
 end

-- 
ci-tooling packaging