[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/build-kde-org/sok-work] /: Add bazaar support.
From:       Scarlett Clark <scarlett () scarlettgatelyclark ! com>
Date:       2015-03-31 23:59:08
Message-ID: E1Yd63o-0005CL-80 () scm ! kde ! org
[Download RAW message or body]

Git commit 04ed2989eff3b085530f2d73e4c9cbc1306a8e92 by Scarlett Clark.
Committed on 31/03/2015 at 23:58.
Pushed by scarlettclark into branch 'sok-work'.

Add bazaar support.
Add external dep libdbusmenu-qt

M  +7    -0    base.groovy
M  +12   -0    config/identifiers.json
M  +1    -2    helpers/ProjectSCMHelpers.groovy

http://commits.kde.org/websites/build-kde-org/04ed2989eff3b085530f2d73e4c9cbc1306a8e92

diff --git a/base.groovy b/base.groovy
index 751e526..d7e1193 100644
--- a/base.groovy
+++ b/base.groovy
@@ -84,6 +84,9 @@ while(projects.hasNext()) {
 	if (json.svn != null) {
 		repo = json.svn
 		external = true
+	} else if (json.bzr !=null) {
+		repo = json.bzr
+		external = true
 	} else if (json.git !=null) {
 		repo = json.git
 		external = true
@@ -117,6 +120,8 @@ while(projects.hasNext()) {
 	
 	if (repo =~ 'svn:/') {		
 		println "Creating SVN job ${jobname}"
+	} else if (external == true && json.bzr != null) {
+		println "Creating External Bazaar job ${jobname}"
 	} else if (external == true && json.git != null) {
 		println "Creating External job ${jobname}"
 	} else if (grouppath == [] && external != true) {		
@@ -230,6 +235,8 @@ while(projects.hasNext()) {
 			configure createGitSCM(jobname, "${repo}", "${branch}", redmine)
 		} else if (repo =~ "svn:/")	{
 			configure createSVNSCM(repo)
+		} else if (repo =~ "lp:/")	{
+			configure createBzrSCM(repo)
 		}	
 		//Run the parent on a LINBUILDER
 		configure miscParent()
diff --git a/config/identifiers.json b/config/identifiers.json
index 1462f98..775df0f 100644
--- a/config/identifiers.json
+++ b/config/identifiers.json
@@ -4188,6 +4188,18 @@
 		"publishers":"true"	
 	},
 	{
+		"projectname":"libdbusmenu-qt",
+		"bzr":"lp:libdbusmenu-qt",
+		"branchgroups": {
+							"kf5-qt5":"master",
+							"stable-kf5-qt5":"master"
+						},
+		"logrotator":"-1,50,-1,-1",
+		"html5":"false",
+		"cron":"@weekly",
+		"publishers":"true"	
+	},
+	{
 		"projectname":"networkmanager-qt",
 		"logrotator":"-1,50,-1,-1",
 		"html5":"false",
diff --git a/helpers/ProjectSCMHelpers.groovy b/helpers/ProjectSCMHelpers.groovy
index dfbd242..e44e288 100644
--- a/helpers/ProjectSCMHelpers.groovy
+++ b/helpers/ProjectSCMHelpers.groovy
@@ -77,12 +77,11 @@ class ProjectSCMHelpers {
 				}
 		}		
 	}
-	// Not ready for production bzr code
 	static Closure createBzrSCM(String bzrurl) {
 		//TO-DO
 		return { project ->
 		project.name = 'matrix-project'
-		project << scm (class:"hudson.plugins.git.GitSCM") {
+		project << scm (class:"hudson.plugins.bazaar.BazaarSCM") {
 			source "${bzrurl}"
 			cleantree false
 			checkout false
[prev in list] [next in list] [prev in thread] [next in thread]