From 2de90d7176ef5b5e41d05541d47d94f0a79caee1 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 22 Sep 2019 19:15:34 +0200 Subject: Jenkins: fix httpURI in isCustomBuild() --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index c48136b34..5ff6bcb65 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ def getGitRepoURL() { def isCustomBuild() { // GitHub organisation base URL def gitURI = 'git@github.com:vyos/' + env.JOB_NAME - def httpURI = 'https://github.com/vyos' + env.JOB_NAME + def httpURI = 'https://github.com/vyos/' + env.JOB_NAME return ! ((getGitRepoURL() == gitURI) || (getGitRepoURL() == httpURI)) } -- cgit v1.2.3 From 274af63ff9aac03dd2de2bdb6c5c44fdb18cc1bd Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 22 Sep 2019 20:05:33 +0200 Subject: Jenkins: output git repo URL --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 5ff6bcb65..6e3ab11e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,6 +32,7 @@ def isCustomBuild() { def gitURI = 'git@github.com:vyos/' + env.JOB_NAME def httpURI = 'https://github.com/vyos/' + env.JOB_NAME + echo getGitRepoURL() return ! ((getGitRepoURL() == gitURI) || (getGitRepoURL() == httpURI)) } -- cgit v1.2.3 From 4a9c8a32ddc1ff3248ae0d1d99589850d0353fdd Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 22 Sep 2019 20:08:29 +0200 Subject: Jenkins: fix isCustomBuild() URL --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 6e3ab11e1..63e001804 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,10 +29,10 @@ def getGitRepoURL() { // env.JOB_NAME is e.g. vyos-build or vyos-1x and so on .... def isCustomBuild() { // GitHub organisation base URL - def gitURI = 'git@github.com:vyos/' + env.JOB_NAME - def httpURI = 'https://github.com/vyos/' + env.JOB_NAME + def repoPath = 'vyos/' + env.JOB_NAME + '.git' + def gitURI = 'git@github.com:' + repoPath + def httpURI = 'https://github.com/' + repoPath - echo getGitRepoURL() return ! ((getGitRepoURL() == gitURI) || (getGitRepoURL() == httpURI)) } -- cgit v1.2.3 From 7f8abb336c0d1345f8dd4b1432104cc2c35956b5 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 22 Sep 2019 20:11:30 +0200 Subject: Jenkins: hardocde repo URL --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 63e001804..639457d2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,9 +29,8 @@ def getGitRepoURL() { // env.JOB_NAME is e.g. vyos-build or vyos-1x and so on .... def isCustomBuild() { // GitHub organisation base URL - def repoPath = 'vyos/' + env.JOB_NAME + '.git' - def gitURI = 'git@github.com:' + repoPath - def httpURI = 'https://github.com/' + repoPath + def gitURI = 'git@github.com:vyos/vyos-1x.git' + def httpURI = 'https://github.com/vyos/vyos-1x.git' return ! ((getGitRepoURL() == gitURI) || (getGitRepoURL() == httpURI)) } -- cgit v1.2.3 From f53d9c486376b3908e51cd73780980ead1e3a703 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 22 Sep 2019 20:13:13 +0200 Subject: Jenkins: adjust description --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 639457d2d..b937d22e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ def setDescription() { // build up the main description text def description = "" - description += "

Build VyOS ISO image

" + description += "

VyOS individual package build: vyos-1x

" if (isCustomBuild()) { description += "

" -- cgit v1.2.3