From 14ff3601ee1c72496af243eca74ac269d26d6877 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Tue, 13 Jun 2017 10:48:51 -0700 Subject: [PATCH] Fully render GitHub SCM clone URLs After additional testing it has been proven that the GitHub plugin itself, which is used for the final merge (push) operation will only register as a handler if the SCM URL is fully realized without any variables. Issue: RELENG-191 Change-Id: I3492dac96e85a3d81819fd2ba810629f179d0c04 Signed-off-by: Andrew Grimberg --- README.md | 4 ++++ jjb/lf-ci-jobs.yaml | 4 ++-- jjb/lf-maven-jobs.yaml | 2 +- jjb/lf-python-jobs.yaml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0ce3c240..cbaaa29d 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,10 @@ general this should be https://github.com. If you are using GitHub Enterprise, or some other GitHub-style system, then it should be whatever your installation base URL is. +**git-clone-url**: This is the clone prefix used by GitHub jobs. This +should be set to either the same thing as **git-url** or the +'git@github.com:' including the trailing ':' + **github-org**: The name of the GitHub organization. defaults.yaml: diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 24a1e158..358e7eb5 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -217,7 +217,7 @@ scm: - lf-infra-github-scm: - url: '${{GIT_CLONE_URL}}{github-org}/{project}' + url: '{git-clone-url}{github-org}/{project}' refspec: '' branch: '{branch}' submodule-recursive: '{submodule-recursive}' @@ -256,7 +256,7 @@ scm: - lf-infra-github-scm: - url: '${{GIT_CLONE_URL}}{github-org}/{project}' + url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' branch: '{branch}' submodule-recursive: '{submodule-recursive}' diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index bb376a36..afefd4c9 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -136,7 +136,7 @@ scm: - lf-infra-github-scm: - url: '${{GIT_CLONE_URL}}{github-org}/{project}' + url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' branch: '{branch}' submodule-recursive: '{submodule-recursive}' diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index 3e4add29..4d77d412 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -127,7 +127,7 @@ scm: - lf-infra-github-scm: - url: '${{GIT_CLONE_URL}}{github-org}/{project}' + url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' branch: '{branch}' submodule-recursive: '{submodule-recursive}' -- 2.16.6