Tweaks.
diff --git a/cicd/pipelines/tasks/task_updatepackages.jenkins b/cicd/pipelines/tasks/task_updatepackages.jenkins
index 1ed3ce5..73f9420 100644
--- a/cicd/pipelines/tasks/task_updatepackages.jenkins
+++ b/cicd/pipelines/tasks/task_updatepackages.jenkins
@@ -35,8 +35,15 @@
stage('Init') {
container('debian') {
sh """
- mkdir -p archive/pool
+ apt-get update
+ apt-get -y install apt-utils
"""
+ }
+ }
+
+ stage('Build') {
+ container('debian') {
+ sh "mkdir -p archive/pool"
packageBuildNames.each {
copyArtifacts(projectName: it,
@@ -46,25 +53,9 @@
selector: lastSuccessful())
}
- sh """
- apt-get update
- apt-get -y install curl gnupg
- echo "deb http://packages.cloud.google.com/apt gcsfuse-jessie main" > /etc/apt/sources.list.d/gcsfuse.list
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
- apt-get update
- apt-get -y install apt-utils gcsfuse
- """
- }
- }
-
- stage('Build') {
- container('debian') {
- sh """
- mkdir -p archive/pool
- cp out/target/product/*/packages/*/* archive/pool
- cd archive
- apt-ftparchive -o APT::FTPArchive::SHA512=false pool > Packages
- """
+ dir('archive/pool') {
+ sh "apt-ftparchive -o APT::FTPArchive::SHA512=false pool > Packages"
+ }
}
}
