From 3c20141faaba1078bd5f16419df900637c1fd15b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 4 Jun 2020 20:12:59 +0200 Subject: Jenkins: remove redundant code --- Jenkinsfile | 14 +------------- 1 file changed, 1 insertion(+), 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') - } } } -- cgit v1.2.3