diff --git a/services/jenkins.js b/services/jenkins.js index fea0ea51..2ea41b8f 100644 --- a/services/jenkins.js +++ b/services/jenkins.js @@ -1,4 +1,4 @@ -import { head } from "../lib/git.js"; +import { getSlugFromGitURL, head } from "../lib/git.js"; // https://wiki.jenkins.io/display/JENKINS/Building+a+software+project @@ -18,6 +18,7 @@ export default { return { name: "Jenkins", service: "jenkins", + slug: getSlugFromGitURL(env.GIT_URL), commit: env.ghprbActualCommit || env.GIT_COMMIT || head({ env, cwd }), branch: isPr ? env.ghprbTargetBranch || env.gitlabTargetBranch diff --git a/test/services/jenkins.test.js b/test/services/jenkins.test.js index 2dbe8d56..bd845c3c 100644 --- a/test/services/jenkins.test.js +++ b/test/services/jenkins.test.js @@ -3,6 +3,7 @@ import jenkins from "../../services/jenkins.js"; const env = { JENKINS_URL: "http://jenkins.jenkins.example/", + GIT_URL: "https://github.com/user/repo.git", GIT_COMMIT: "5678", BUILD_NUMBER: "91011", BUILD_URL: "http://jenkins.jenkins.example/buildResult", @@ -15,6 +16,7 @@ test("Push", (t) => { { name: "Jenkins", service: "jenkins", + slug: "user/repo", commit: "5678", build: "91011", buildUrl: "http://jenkins.jenkins.example/buildResult", @@ -35,6 +37,7 @@ test("PR", (t) => { { name: "Jenkins", service: "jenkins", + slug: "user/repo", commit: "5678", build: "91011", buildUrl: "http://jenkins.jenkins.example/buildResult", @@ -60,6 +63,7 @@ test("PR (PR ghprb-plugin)", (t) => { { name: "Jenkins", service: "jenkins", + slug: "user/repo", commit: "5678", build: "91011", buildUrl: "http://jenkins.jenkins.example/buildResult", @@ -85,6 +89,7 @@ test("PR (gitlab-plugin)", (t) => { { name: "Jenkins", service: "jenkins", + slug: "user/repo", commit: "5678", build: "91011", buildUrl: "http://jenkins.jenkins.example/buildResult",