diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:06:15 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:06:15 +0100 |
| commit | 3bbf961b8ef3f2f2d79a3058ccbbaee537cefc67 (patch) | |
| tree | 5c9e5afeaa0525317365f7d3d1523f4b8927cc9e | |
| parent | 2719269e892ab5a68e76c588b24634d3ed042633 (diff) | |
| parent | 3f085707fb2dbc0bf62d571b45cdeb0383f6bb18 (diff) | |
| download | vyatta-biosdevname-3bbf961b8ef3f2f2d79a3058ccbbaee537cefc67.tar.gz vyatta-biosdevname-3bbf961b8ef3f2f2d79a3058ccbbaee537cefc67.zip | |
Merge branch 'equuleus' of github.com:vyos/vyatta-biosdevname into current
* 'equuleus' of github.com:vyos/vyatta-biosdevname:
Jenkins: import Pipeline from vyos-1x commit e541ffc4f34c
update Jenkins file for equuleus
| -rw-r--r-- | Jenkinsfile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index bcce16d..3b8daeb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,6 +74,7 @@ pipeline { docker { args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' image 'vyos/vyos-build:current' + alwaysPull true } } options { @@ -122,9 +123,6 @@ pipeline { // every option over and over again! def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + getGitBranchName() + '/' - if (getGitBranchName() != "equuleus") - VYOS_REPO_PATH += 'vyos/' - def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR' def SSH_REMOTE = 'khagen@10.217.48.113' |