summaryrefslogtreecommitdiff
path: root/Jenkinsfile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-04 20:12:59 +0200
committerChristian Poessinger <christian@poessinger.com>2020-06-04 20:12:59 +0200
commit3c20141faaba1078bd5f16419df900637c1fd15b (patch)
treeac5a5d75cf8efc4aee571f98ea01f937a67cf17d /Jenkinsfile
parent574c853c8c216c9fe84fcc42d1fa80c6b50280f2 (diff)
downloadvyos-build-3c20141faaba1078bd5f16419df900637c1fd15b.tar.gz
vyos-build-3c20141faaba1078bd5f16419df900637c1fd15b.zip
Jenkins: remove redundant code
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile14
1 files changed, 1 insertions, 13 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 466e6f79..7d9c72fc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -177,9 +177,7 @@ pipeline {
}
stage('Test ISO') {
steps {
- sh """
- sudo make test
- """
+ sh "sudo make test"
}
}
}
@@ -203,17 +201,8 @@ pipeline {
// will fail if sh returns a non 0 exit code
sh """
ssh ${SSH_OPTS} ${SSH_REMOTE} -t "bash --login -c 'mkdir -p ${SSH_DIR}'"
- """
- sh """
- ssh ${SSH_OPTS} ${SSH_REMOTE} -t "bash --login -c 'mkdir -p ${SSH_DIR}'"
- """
- sh """
ssh ${SSH_OPTS} ${SSH_REMOTE} -t "bash --login -c 'find ${SSH_DIR} -type f -mtime +14 -exec rm -f {} \\;'"
- """
- sh """
scp ${SSH_OPTS} build/vyos*.iso ${SSH_REMOTE}:${SSH_DIR}/
- """
- sh """
ssh ${SSH_OPTS} ${SSH_REMOTE} -t "bash --login -c '/usr/bin/make-latest-rolling-symlink.sh'"
"""
}
@@ -223,7 +212,6 @@ pipeline {
def ARCH = sh(returnStdout: true, script: "dpkg --print-architecture").trim()
s3Upload( bucket: 's3-us.vyos.io', path: 'rolling/', workingDir:'build', includePathPattern: 'vyos*.iso' )
s3Copy( fromBucket:'s3-us.vyos.io', fromPath:'rolling/' + files[0].name , toBucket:'s3-us.vyos.io', toPath: 'rolling/vyos-rolling-latest.iso')
-
}
}
}