commit fc4fa6963277af674df6847508a4ba5abb7aca8b
author June Tate-Gans <jtgans@google.com> Fri Jun 19 18:00:03 2020 -0400
committer June Tate-Gans <jtgans@google.com> Fri Jun 19 18:00:03 2020 -0400
tree f0c10830aa53abc912b74a6454f53dc8e4cbca7a
parent da770853ce38a500f4331bf7c5825b569e5f665d

release-cut: Fix the variable names referenced in the merge commands

Change-Id: I5d817dbf5e9ff0cfa5e64e2bb2afb3a7f7c753d5

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 fb9ddc9..75c0d81 100644
--- a/cicd/pipelines/tasks/task_release_cut.jenkins
+++ b/cicd/pipelines/tasks/task_release_cut.jenkins
@@ -40,7 +40,7 @@
                         def unstablePublishedBspSnapshotName = functions.getSnapshotFromPublish('unstable', "unstable-bsp-${board}", 'main')
                         def releasedBspSnapshotName = "${releaseName}-bsp-${board}-${stamp}"
 
-                        sh "aptly snapshot merge ${releasedBspSnapshotName} ${unstableBspSnapshotName}"
+                        sh "aptly snapshot merge ${releasedBspSnapshotName} ${unstablePublishedBspSnapshotName}"
 
                         if (functions.bspIsPublished(releaseName, board)) {
                            sh "aptly publish switch --batch --force-overwrite --passphrase-file=/var/lib/aptly/keyring/passphrase.txt ${releaseName} filesystem:public:${releaseName}-bsp-${board} ${releasedBspSnapshotName}"
@@ -52,7 +52,7 @@
                     def unstablePublishedCoreSnapshotName = functions.getSnapshotFromPublish('unstable', 'unstable', 'main')
                     def releasedCoreSnapshotName = "core-full-${releaseName}-${stamp}"
 
-                    sh "aptly snapshot merge ${releasedCoreSnapshotName} ${unstableCoreSnapshotName}"
+                    sh "aptly snapshot merge ${releasedCoreSnapshotName} ${unstablePublishedCoreSnapshotName}"
 
                     if (functions.coreIsPublished(releaseName)) {
                         sh "aptly publish switch --batch --force-overwrite --passphrase-file=/var/lib/aptly/keyring/passphrase.txt ${releaseName} filesystem:public:${releaseName} ${releasedCoreSnapshotName}"