Merge "findChangedPathsInCommit"
diff --git a/src/com/mirantis/mk/Helm.groovy b/src/com/mirantis/mk/Helm.groovy
index 61ff48a..ad262e0 100644
--- a/src/com/mirantis/mk/Helm.groovy
+++ b/src/com/mirantis/mk/Helm.groovy
@@ -18,17 +18,22 @@
/**
* Rebuild index file for helm chart repo
- * @param helmRepoUrl repository with helm charts
- * @param md5Remote md5 sum of index.yaml for check
+ * @param absHelmRepoUrl if set to true, URLs to charts will be absolute
+ * @param helmRepoUrl repository with helm charts
+ * @param md5Remote md5 sum of index.yaml for check
*/
-def helmMergeRepoIndex(helmRepoUrl, md5Remote='') {
+def helmMergeRepoIndex(helmRepoUrl, md5Remote='', absHelmRepoUrl=true) {
def common = new com.mirantis.mk.Common()
def helmRepoDir = '.'
- def helmExtraParams = "--url ${helmRepoUrl}"
+ def helmExtraParams = ''
+ if (absHelmRepoUrl) {
+ helmExtraParams = "--url ${helmRepoUrl}"
+ }
def indexRes = common.shCmdStatus("wget -O index-upstream.yaml ${helmRepoUrl}/index.yaml")
+
if (indexRes['status']){
if (indexRes['status'] == 8 && indexRes['stderr'].contains('ERROR 404') && !md5Remote) {
common.warningMsg("Index.yaml not found in ${helmRepoUrl} and will be fully regenerated")
diff --git a/src/com/mirantis/mk/JenkinsUtils.groovy b/src/com/mirantis/mk/JenkinsUtils.groovy
index b760812..a9c5d0c 100644
--- a/src/com/mirantis/mk/JenkinsUtils.groovy
+++ b/src/com/mirantis/mk/JenkinsUtils.groovy
@@ -277,3 +277,30 @@
}
return [status: true, log: '', jobs: depList]
}
+
+/**
+ * Return jenkins infra metadata according to specified jenkins intstance
+
+ * @param jenkinsServerURL (string) URL to jenkins server in form: env.JENKINS_URL
+ * @return (map)[
+ * jenkins_service_user: (string) name of jenkins user needed for gerrit ops
+ * ]
+ */
+def getJenkinsInfraMetadata(jenkinsServerURL) {
+ def meta = [
+ jenkins_service_user: '',
+ ]
+
+ switch (jenkinsServerURL) {
+ case 'https://ci.mcp.mirantis.net/':
+ meta['jenkins_service_user'] = 'mcp-jenkins'
+ break
+ case 'https://mcc-ci.infra.mirantis.net/':
+ meta['jenkins_service_user'] = 'mcc-ci-jenkins'
+ break
+ default:
+ error("Failed to detect jenkins service user, supported jenkins platforms: 'https://ci.mcp.mirantis.net/' 'https://mcc-ci.infra.mirantis.net/'")
+ }
+
+ return meta
+}