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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit a7008f34a92d61e289053a97352c59b694e72df3
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 12 12:36:46 2015 +0100

    builder, ppa-wait: implement stability handling
    
    - PPA constant is init'd to the project stability value (unstable/stable)
    - the stability is then passed along to ppa-wait so it can look in the
      right ppa
    - symbol generation is disabled for stable, needs some brain power to
      figure out what to do with symbols
---
 builder.rb  | 11 ++++++-----
 ppa-wait.py | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/builder.rb b/builder.rb
index 3d3d670..f1bcd49 100644
--- a/builder.rb
+++ b/builder.rb
@@ -8,7 +8,6 @@ require_relative 'lib/debian/changelog'
 ENV['HOME'] = '/var/lib/jenkins'
 ENV['PATH'] = '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin'
 ENV['GNUPGHOME'] = '/var/lib/jenkins/tooling/gnupg'
-PPA = 'ppa:kubuntu-ci/unstable'
 KEYID = 'AB3CE70E'
 
 Project = Struct.new(:series, :stability, :name)
@@ -18,6 +17,8 @@ components = ARGV[0].split('_')
 raise 'Did not get a valid project identifier via ARGV0' unless components.size == 3
 project = Project.new(components[0], components[1], components[2])
 
+PPA = "ppa:kubuntu-ci/#{project.stability}"
+
 File.open('/etc/apt/apt.conf.d/apt-cacher', 'w') { |file| file.puts('Acquire::http { Proxy "http://10.0.3.1:3142"; };') }
 
 # PWD
@@ -28,7 +29,6 @@ WORKSPACE_PATH = ARGV[1]
 # install deps
 `apt-get install -y xz-utils dpkg-dev ruby dput debhelper pkg-kde-tools devscripts python-launchpadlib ubuntu-dev-tools git`
 
-
 # version
 Dir.chdir('packaging') do
     $changelog = Changelog.new
@@ -84,7 +84,7 @@ Dir.chdir('build/source/') do
         end
 
         # FIXME: bloody workaround for kconfigwidgets and kdelibs4support containing legit locale data
-        next if source_name == 'kconfigwidgets' or source_name == 'kdelibs4support'        
+        next if source_name == 'kconfigwidgets' or source_name == 'kdelibs4support'
         subbed = File.open(install_file_path).read().gsub(/^.*usr\/share\/locale.*$/, '')
         File.open(install_file_path, 'w') do |f|
             f << subbed
@@ -141,7 +141,7 @@ Dir.chdir('build/source/') do
     end
     raise '		 !!!!!!!!!!!!!!!! dput failed two times !!!!!!!!!!!!!!!!' unless success
     Dir.chdir('../..') do # main dir
-        raise 'PPA Interaction Failed' unless system("#{File.expand_path(File.dirname(__FILE__))}/ppa-wait.py #{changelog.name} #{changelog.version}")
+        raise 'PPA Interaction Failed' unless system("#{File.expand_path(File.dirname(__FILE__))}/ppa-wait.py #{changelog.name} #{changelog.version} #{project.stability}")
     end
 end
 
@@ -325,7 +325,8 @@ archindep = File.read('archindep').strip rescue 'amd64' # Get archindep from ppa
 log_data = File.open("logs/#{archindep}.log").read
 
 updated_symbols = false
-if log_data.match(/dpkg-gensymbols: warning: (.*)\/symbols doesn't match completely debian\/(.*).symbols/)
+# FIXME: stability wtf
+if project.stability == 'unstable' && log_data.match(/dpkg-gensymbols: warning: (.*)\/symbols doesn't match completely debian\/(.*).symbols/)
     puts 'KCI::SYMBOLS'
     if log_data.include?('dpkg-gensymbols: warning: some new symbols appeared')
         match = log_data.match(/--- debian\/(.*).symbols/)
diff --git a/ppa-wait.py b/ppa-wait.py
index a6476ca..6025df2 100644
--- a/ppa-wait.py
+++ b/ppa-wait.py
@@ -88,12 +88,13 @@ def get_logs(source):
         f.write(archindep)
     print("logs done.")
 
-ppa = getPPAObject("kubuntu-ci", "unstable")
-
-print "------------------------- Waiting for LP Builds -------------------------"
-
 pkg_name = sys.argv[1]
 pkg_version = sys.argv[2]
+ppa_name = sys.argv[3]
+
+ppa = getPPAObject("kubuntu-ci", ppa_name)
+
+print "------------------------- Waiting for LP Builds -------------------------"
 
 def getSource():
     fail_count = 0
@@ -110,7 +111,7 @@ def getSource():
 # If it takes 20 minutes for the source to arrive it probably got rejected
 fail_count = 20 # This is minutes
 while True:
-    source = None 
+    source = None
     try:
         # This will raise on index access if we have no sources yet.
         source = getSource()

-- 
ci-tooling packaging