commit dbf52acc923cd6980e100a10d52428245375b797
author June Tate-Gans <jtgans@google.com> Wed Apr 22 15:17:42 2020 -0400
committer June Tate-Gans <jtgans@google.com> Wed Apr 22 15:31:37 2020 -0400
tree d9cfeee20f8ba5378b5d2874cda834b46e3c542f
parent 9ed451721aa5992108bdfa772f1fe0a087d09937

Migrate to using aptly-ctl to upload packages to aptly.

Change-Id: I6992c54195cc086a5b9cb93f207747aec03fb62d

vars/functions.groovy

diff --git a/vars/functions.groovy b/vars/functions.groovy
index c1a23fe..4bd20b8 100644
--- a/vars/functions.groovy
+++ b/vars/functions.groovy
@@ -58,32 +58,16 @@
     }
 }
 
-def archiveAllGeneratedPackages(repoType, boardName) {
-    def outPath = repoType
-    def repoName = nameFromRepoType(repoType, boardName)
-
-    sh """
-       mkdir -p pool/${repoName}
-       cp src/out/target/product/*/packages/${outPath}/* pool/${repoName}
-       """
-
-    archiveArtifacts([artifacts: "pool/${repoName}/*",
-                      fingerprint: true])
-}
-
 def uploadAllGeneratedPackages(repoType, boardName) {
     def outPath = repoType
     def repoName = nameFromRepoType(repoType, boardName)
 
     sh """
-       mkdir -p upload
-       cp src/out/target/product/*/packages/${outPath}/* upload/
-       """
-    googleStorageUpload([bucket: "gs://mendel-linux-apt/pool/${repoName}/",
-                         credentialsId: 'mendel-linux-cloud-infra',
-                         pattern: "upload/*",
-                         pathPrefix: "upload/",
-                         sharedPublicly: true])
+    aptly-ctl -C url=http://aptly-api/api \
+              -C signing.gpgkey=none \
+              -C signing.passphrase=none \
+              put unstable-${repoName} src/out/target/product/*/packages/${outPath}/*
+    """
 }
 
 def buildPackagePipeline(boardName, repoType, packageName, needsNative = false) {
@@ -119,7 +103,6 @@
 
             dir(workspacePath) {
                 stage('Deploy') {
-                    archiveAllGeneratedPackages(repoType, boardName)
                     uploadAllGeneratedPackages(repoType, boardName)
                 }
             }