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

List:       kde-commits
Subject:    [sysadmin/ci-tools-experimental] /: I see now the error of my ways, rename the external-repo to yaml
From:       Scarlett Clark <sgclark () kde ! org>
Date:       2016-11-15 15:12:25
Message-ID: E1c6fPN-000396-VN () code ! kde ! org
[Download RAW message or body]

Git commit f58b37eea9add31cd67c4b67d7ca28b7f5e1e982 by Scarlett Clark.
Committed on 15/11/2016 at 15:10.
Pushed by scarlettclark into branch 'master'.

I see now the error of my ways, rename the external-repo to yaml to avoid conflict with the job metadata.

M  +5    -5    transitional_base.groovy

http://commits.kde.org/sysadmin/ci-tools-experimental/f58b37eea9add31cd67c4b67d7ca28b7f5e1e982

diff --git a/transitional_base.groovy b/transitional_base.groovy
index eeb2867..48624b5 100644
--- a/transitional_base.groovy
+++ b/transitional_base.groovy
@@ -62,11 +62,11 @@ GroupFile.each { group ->
 				//Remove all excluded_repositories
 				def arepoDataFile = configs.removeExcludedRepositories( repoDataFile, job.excluded_repositories)
 				if (group != 'external') {
-					projrepoyaml = 	 configs.getConfig(basePath + 'external-repo.yml')
-					println projrepoyaml
-				} else {
-					projrepoyaml = configs.getConfig(repoDataFile.find { it =~ jobname + '/' + 'metadata.yaml' })
-					println projrepoyaml
+					 projrepoyaml = configs.getConfig(repoDataFile.find { it =~ jobname + '/' + 'metadata.yaml' })
+					 println projrepoyaml
+				} else if( group == 'external' ){
+					 projrepoyaml = 	 configs.getConfig(basePath + 'external-repo.yaml')
+					 println projrepoyaml
 			 }
 				RepoMetaValues repodata = RepoMetaValues.newInstance(projrepoyaml)
 
[prev in list] [next in list] [prev in thread] [next in thread]