summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-12-18 12:15:20 +0100
committerChristian Poessinger <christian@poessinger.com>2019-12-18 12:15:20 +0100
commit3f96c93de44877fb704e4ed3a557a0d3c41039e3 (patch)
treebca04500e741cc3ad67f5ebcae1a558a71dcd391
parent857ec039b08dc3b0414d7d0274b52ac0a576e032 (diff)
parent603cfb84c03bb296c0d573a3a32ac519507e8f97 (diff)
downloadvyatta-conntrack-3f96c93de44877fb704e4ed3a557a0d3c41039e3.tar.gz
vyatta-conntrack-3f96c93de44877fb704e4ed3a557a0d3c41039e3.zip
Merge branch 'equuleus' of github.com:vyos/vyatta-conntrack into current
* 'equuleus' of github.com:vyos/vyatta-conntrack: Jenkins: import Pipeline from vyos-1x commit e541ffc4f34c update Jenkins file for equuleus Depend on Upstream Debian Buster conntrack versions
-rw-r--r--Jenkinsfile4
-rw-r--r--debian/control2
2 files changed, 2 insertions, 4 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/control b/debian/control
index 6e06479..0e16005 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Depends: vyatta-cfg-system,
vyatta-cfg,
vyatta-op,
conntrack,
- conntrack-helpers,
+ conntrackd,
nfct
Replaces: vyatta-cfg-system,
vyatta-cfg-firewall