commit e0945d9e73b5ca0af15eb4518f487b6b2361d841
author June Tate-Gans <jtgans@google.com> Mon Jun 01 13:53:03 2020 -0400
committer June Tate-Gans <jtgans@google.com> Mon Jun 01 13:53:03 2020 -0400
tree ee644c3e9f66310cf5238747c143df05846a2f81
parent d9397641c604bb817d84947745368a42eb955835

Use default keyring

Change-Id: If09188bd733e1bf6f9881d43d967b912452c8385

cicd/pipelines/tasks/task_publish_unstable.jenkins

diff --git a/cicd/pipelines/tasks/task_publish_unstable.jenkins b/cicd/pipelines/tasks/task_publish_unstable.jenkins
index 0cc02b6..ba1a98f 100644
--- a/cicd/pipelines/tasks/task_publish_unstable.jenkins
+++ b/cicd/pipelines/tasks/task_publish_unstable.jenkins
@@ -14,17 +14,6 @@
     return sh(returnStdout: true, script: "cat ${filename}").trim()
 }
 
-String getKeygripId() {
-    def script = '''
-        gpg --with-colons --list-secret-keys \
-            | awk -F: '\$1 == "grp" { print \$10 }' \
-            | head -n1
-    '''
-
-    sh(script: script)
-    return sh(returnStdout: true, script: script).trim()
-}
-
 def workspacePath = "/home/jenkins/workspace"
 def buildLabel = "task.publish.unstable-${UUID.randomUUID().toString()}"
 def sourcePath = "${workspacePath}/src"
@@ -58,8 +47,6 @@
                        gpg --list-secret-keys
                        """
 
-                    def keygripId = getKeygripId()
-
                     def debianMirrorSnapshotName = getLatestSnapshot('debian-buster')
                     def coreSnapshotName = getLatestSnapshot('core-unstable')
                     def bspSnapshotName  = getLatestSnapshot('enterprise-bsp-unstable')
@@ -69,8 +56,8 @@
                     sh """
                        mkdir -p /var/lib/aptly/publishes/unstable
                        aptly snapshot merge core-full-unstable-${stamp} ${debianMirrorSnapshotName} ${coreSnapshotName}
-                       aptly publish snapshot --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --gpg-key=${keygripId} --distribution=unstable core-full-unstable-${stamp} filesystem:unstable:unstable
-                       aptly publish snapshot --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --gpg-key=${keygripId} --distribution=unstable ${bspSnapshotName} filesystem:unstable:unstable
+                       aptly publish snapshot --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --distribution=unstable core-full-unstable-${stamp} filesystem:unstable:unstable
+                       aptly publish snapshot --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --distribution=unstable ${bspSnapshotName} filesystem:unstable:unstable
                        """
                 }
             }