Merge branch 'current' into equuleus

2 files changed, 124 insertions, 22 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..563ead2
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,119 @@
+pipeline {
+  agent none
+  stages {
+    stage('build-package') {
+      parallel {
+        stage('Build package amd64') {
+          agent {
+            docker {
+              label 'jessie-amd64'
+              args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp'
+              image 'higebu/vyos-build:current'
+            }
+
+          }
+          steps {
+            sh '''#!/bin/bash
+git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER
+cd $BUILD_NUMBER
+sudo apt-get -o Acquire::Check-Valid-Until=false update
+sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control
+dpkg-buildpackage -b -us -uc -tc
+mkdir -p /tmp/$GIT_BRANCH/packages/script
+mv ../*.deb /tmp/$GIT_BRANCH/packages/'''
+          }
+        }
+        stage('Build package armhf') {
+          agent {
+            docker {
+              label 'jessie-amd64'
+              image 'vyos-build-armhf:current'
+              args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp'
+            }
+
+          }
+          steps {
+            sh '''#!/bin/bash
+git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER
+cd $BUILD_NUMBER
+sudo apt-get -o Acquire::Check-Valid-Until=false update
+sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control
+dpkg-buildpackage -b -us -uc -tc
+mkdir -p /tmp/$GIT_BRANCH/packages/script
+mv ../*.deb /tmp/$GIT_BRANCH/packages/'''
+          }
+        }
+        stage('Build package arm64') {
+          agent {
+            docker {
+              label 'jessie-amd64'
+              args '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006 -v /tmp:/tmp'
+              image 'vyos-build-arm64:current'
+            }
+
+          }
+          steps {
+            sh '''#!/bin/bash
+git clone --single-branch --branch $GIT_BRANCH $GIT_URL $BUILD_NUMBER
+cd $BUILD_NUMBER
+sudo apt-get -o Acquire::Check-Valid-Until=false update
+sudo mk-build-deps -i -r -t \'apt-get --no-install-recommends -yq\' debian/control
+dpkg-buildpackage -b -us -uc -tc
+mkdir -p /tmp/$GIT_BRANCH/packages/script
+mv ../*.deb /tmp/$GIT_BRANCH/packages/'''
+          }
+        }
+      }
+    }
+    stage('Deploy packages') {
+      agent {
+        node {
+          label 'jessie-amd64'
+        }
+
+      }
+      steps {
+        sh '''#!/bin/bash
+cd /tmp/$GIT_BRANCH/packages/script
+/var/lib/vyos-build/pkg-build.sh $GIT_BRANCH'''
+      }
+    }
+    stage('Cleanup') {
+      parallel {
+        stage('Cleanup amd64') {
+          agent {
+            node {
+              label 'jessie-amd64'
+            }
+
+          }
+          steps {
+            cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true)
+          }
+        }
+        stage('Cleanup armhf') {
+          agent {
+            node {
+              label 'jessie-amd64'
+            }
+
+          }
+          steps {
+            cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true)
+          }
+        }
+        stage('Cleanup arm64') {
+          agent {
+            node {
+              label 'jessie-amd64'
+            }
+
+          }
+          steps {
+            cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, cleanupMatrixParent: true, deleteDirs: true, disableDeferredWipeout: true)
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/scripts/check-params-on-reboot.d/conntrack-hash-size b/scripts/check-params-on-reboot.d/conntrack-hash-size
index a188e0f..8b7a530 100755
--- a/scripts/check-params-on-reboot.d/conntrack-hash-size
+++ b/scripts/check-params-on-reboot.d/conntrack-hash-size
@@ -5,28 +5,11 @@
 
 BOOTFILE=$1
 
-# Obtain firewall config version
-version=`grep "=== vyatta-config-version:" $BOOTFILE | sed -n 's/.*\(firewall\@[0-9]\).*/\1/; h; x;p;q' | awk -F '@' '{print $2}'`
-
-if [ -z $version ]; then
-    logger -s "Warning: could not determine firewall config version. Conntrack hash size will not be updated."
-    exit 1
-fi
-
-if [ $version -ge 5 ]; then
-    # The config is from oxnard or higher
-    cthash_cfg=$(cli-shell-api cfReturnValue $BOOTFILE system conntrack hash-size)
-else
-    # The config is from pre-oxnard release
-    cthash_cfg=$(grep "conntrack-hash-size" /config/config.boot | awk -F ' ' '{print $2}')
-fi
-
-if [ -z "$cthash_cfg" ]; then
-        cthash_cfg=32768 # default hashsize value that Vyatta ships
+if ! cthash_cfg=$($vyos_bin_dir/vyos-config-file-query -f $BOOTFILE --return-value -p "system conntrack hash-size"); then
+    cthash_cfg=32768 # default hashsize value that Vyatta ships
 fi
 
-grep -q "nf_conntrack hashsize=$cthash_cfg" /etc/modprobe.d/vyatta_nf_conntrack.conf
-if [ $? != 0 ]; then
-        sudo sh -c "sed -i -e '/options nf_conntrack hashsize/d' /etc/modprobe.d/vyatta_nf_conntrack.conf"
-        sudo sh -c "echo options nf_conntrack hashsize=$cthash_cfg nf_conntrack_helper=1 >> /etc/modprobe.d/vyatta_nf_conntrack.conf"
+if ! grep -q "nf_conntrack hashsize=$cthash_cfg" /etc/modprobe.d/vyatta_nf_conntrack.conf; then
+    sudo sh -c "sed -i -e '/options nf_conntrack hashsize/d' /etc/modprobe.d/vyatta_nf_conntrack.conf"
+    sudo sh -c "echo options nf_conntrack hashsize=$cthash_cfg nf_conntrack_helper=1 >> /etc/modprobe.d/vyatta_nf_conntrack.conf"
 fi