From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Thu, 22 Mar 2018 19:16:28 +0000 (-0400)
Subject: use docker container for archiving
X-Git-Tag: v3.1.0~42
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=ae61a89d4c49bd7a9bcf8d427f3468f2b2f1a782;p=osm%2Fdevops.git

use docker container for archiving

Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
---

diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
index e87b36f7..20a9454e 100755
--- a/devops-stages/stage-archive.sh
+++ b/devops-stages/stage-archive.sh
@@ -32,7 +32,7 @@ fi
 rm -rf $PKG_DIR
 rm -f *.orig.tar.xz
 rm -f *.deb
-rm $DEB_INSTALL
+rm -f $DEB_INSTALL
 mkdir -p $PKG_DIR
 
 for dir in $PKG_DIRECTORIES; do
diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 52e2f1d3..4d368578 100644
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -59,9 +59,6 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
         stage('Build') {
             sh(returnStdout:true,  script: 'devops-stages/stage-build.sh').trim()
         }
-    }
-
-    stage('Archive') {
         sh "mkdir -p changelog"
         sh "devops/tools/generatechangelog-pipeline.sh > changelog/changelog-${mdg}.html"
         sh(returnStdout:true,  script: 'devops-stages/stage-archive.sh').trim()