diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-09-22 20:14:49 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-09-22 20:14:49 +0200 |
commit | 1183711232af10e474eef3bbe234b5948eac4f11 (patch) | |
tree | e47cf9168e41f08ae2041f7a169c4ed993c3b965 | |
parent | c8d11ef3f77d90dcb880d9c3a11e0ccee7494b30 (diff) | |
parent | f53d9c486376b3908e51cd73780980ead1e3a703 (diff) | |
download | vyos-1x-1183711232af10e474eef3bbe234b5948eac4f11.tar.gz vyos-1x-1183711232af10e474eef3bbe234b5948eac4f11.zip |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
Jenkins: adjust description
Jenkins: hardocde repo URL
Jenkins: fix isCustomBuild() URL
Jenkins: output git repo URL
Jenkins: fix httpURI in isCustomBuild()
-rw-r--r-- | Jenkinsfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 61700662a..184f6930a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,8 +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 gitURI = 'git@github.com:vyos/' + env.JOB_NAME - def httpURI = 'https://github.com/vyos/' + env.JOB_NAME + def gitURI = 'git@github.com:vyos/vyos-1x.git' + def httpURI = 'https://github.com/vyos/vyos-1x.git' return ! ((getGitRepoURL() == gitURI) || (getGitRepoURL() == httpURI)) } @@ -40,7 +40,7 @@ def setDescription() { // build up the main description text def description = "" - description += "<h2>Build VyOS ISO image</h2>" + description += "<h2>VyOS individual package build: vyos-1x</h2>" if (isCustomBuild()) { description += "<p style='border: 3px dashed red; width: 50%;'>" |