Merge branch 'equuleus' of github.com:vyos/vyatta-nat into current

* 'equuleus' of github.com:vyos/vyatta-nat:
  Jenkins: import Pipeline from vyos-1x commit bd00ec7
  update Jenkins file for equuleus

1 files changed, 7 insertions, 5 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 20eb253..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 {
@@ -87,7 +88,8 @@ pipeline {
             steps {
                 script {
                     dir('build') {
-                        git branch: getGitBranchName(), url: getGitRepoURL()
+                        git branch: getGitBranchName(),
+                            url: getGitRepoURL()
                     }
                 }
             }
@@ -96,7 +98,10 @@ pipeline {
             steps {
                 script {
                     dir('build') {
-                        sh "dpkg-buildpackage -b -us -uc -tc"
+                        def commitId = sh(returnStdout: true, script: 'git rev-parse --short=11 HEAD').trim()
+                        currentBuild.description = sprintf('Git SHA1: %s', commitId[-11..-1])
+
+                        sh 'dpkg-buildpackage -b -us -uc -tc'
                     }
                 }
             }
@@ -118,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'