commit 87233d9ce08d222102ecf6e1b096d96c1c0a86a7
author June Tate-Gans <jtgans@google.com> Wed Jun 17 19:32:04 2020 -0400
committer June Tate-Gans <jtgans@google.com> Wed Jun 17 19:32:04 2020 -0400
tree 6efd4b03b07c7f52eee8cebb9a08a0eb90864c08
parent 24c9b30816c997c56bf5d500e5ae22ec59fea4c6

Release BSPs first, then the core.

Change-Id: I8afe244b0ff0690b44d319f1e18ede615fca6c63

cicd/pipelines/tasks/task_release_cut.jenkins

diff --git a/cicd/pipelines/tasks/task_release_cut.jenkins b/cicd/pipelines/tasks/task_release_cut.jenkins
index 332a3ac..43f7ee3 100644
--- a/cicd/pipelines/tasks/task_release_cut.jenkins
+++ b/cicd/pipelines/tasks/task_release_cut.jenkins
@@ -55,14 +55,6 @@
                 withEnv(['GNUPGHOME=/var/lib/aptly/.gnupg']) {
                     installGpgKeyring()
 
-                    def unstableCoreSnapshotName = getLatestSnapshot('core-full-unstable')
-                    def releasedCoreSnapshotName = "core-full-${releaseName}-${stamp}"
-
-                    sh """
-                       aptly snapshot merge ${releasedCoreSnapshotName} ${unstableCoreSnapshotName}
-                       aptly publish snapshot --batch --force-overwrite --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --architectures=source,amd64,arm64,armhf --distribution=${releaseName} ${releasedCoreSnapshotName} filesystem:public:${releaseName}
-                       """
-
                     for (board in boards) {
                         def unstableBspSnapshotName = getLatestSnapshot("unstable-bsp-${board}")
                         def releasedBspSnapshotName = "${releaseName}-bsp-${board}-${stamp}"
@@ -72,6 +64,14 @@
                            aptly publish snapshot --batch --force-overwrite --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --architectures=source,amd64,arm64,armhf --distribution=${releaseName} ${releasedBspSnapshotName} filesystem:public:${releaseName}-bsp-${board}
                            """
                     }
+
+                    def unstableCoreSnapshotName = getLatestSnapshot('core-full-unstable')
+                    def releasedCoreSnapshotName = "core-full-${releaseName}-${stamp}"
+
+                    sh """
+                       aptly snapshot merge ${releasedCoreSnapshotName} ${unstableCoreSnapshotName}
+                       aptly publish snapshot --batch --force-overwrite --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --architectures=source,amd64,arm64,armhf --distribution=${releaseName} ${releasedCoreSnapshotName} filesystem:public:${releaseName}
+                       """
                 }
             }
         }