diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:07:49 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:07:49 +0100 |
| commit | 47d02bb6717de574692096860e7d9e13b0769d6a (patch) | |
| tree | da8eb974a893b95ab615f0d5114cf4d8538cf5e6 /Jenkinsfile | |
| parent | 06201c4e9ccb68341bebbf73acab74e6d51ab361 (diff) | |
| parent | 5c5fe70a36224ffee505483cf8c77bd3a662d816 (diff) | |
| download | vyatta-cfg-47d02bb6717de574692096860e7d9e13b0769d6a.tar.gz vyatta-cfg-47d02bb6717de574692096860e7d9e13b0769d6a.zip | |
Merge branch 'equuleus' of github.com:vyos/vyatta-cfg into current
* 'equuleus' of github.com:vyos/vyatta-cfg:
T1604: run bash builtin "set" as-is in vyatta_cfg_run
Jenkins: import Pipeline from vyos-1x commit e541ffc4f34c
update Jenkins file for equuleus
Diffstat (limited to 'Jenkinsfile')
| -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' |