diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:34:52 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:34:52 +0100 |
| commit | d2782a22b2901ecee9a3e5d61a17179a2d5d8ce4 (patch) | |
| tree | a7fc59151f77f93ca252f76d299e69c6ac7e4cd2 | |
| parent | 5e00eb9182cd116d395ab539abd7e0061d2a09c6 (diff) | |
| parent | 1c08f9698bb802125fd3ec5c4cbc933e40ba243e (diff) | |
| download | vyos-opennhrp-d2782a22b2901ecee9a3e5d61a17179a2d5d8ce4.tar.gz vyos-opennhrp-d2782a22b2901ecee9a3e5d61a17179a2d5d8ce4.zip | |
Merge branch 'equuleus' of github.com:vyos/vyos-opennhrp into current
* 'equuleus' of github.com:vyos/vyos-opennhrp:
Jenkins: import Pipeline from vyos-1x commit e541ffc4f34c
update Jenkins file for equuleus
Changelog update.
| -rw-r--r-- | Jenkinsfile | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 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' diff --git a/debian/changelog b/debian/changelog index 10b49e0..787a0a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyos-opennhrp (0.14.1-1+vyos3+equuleus1) unstable; urgency=medium + + * New branch. + + -- Daniil Baturin <daniil@baturin.org> Tue, 23 Jul 2019 03:25:00 -0400 + vyos-opennhrp (0.14.1-1+vyos2+current1) unstable; urgency=medium [ Thomas Jepp ] |