commit db39b242d249e9fb4aebcc4ebec21308c657a54f
author June Tate-Gans <jtgans@google.com> Thu Jun 11 16:40:41 2020 -0400
committer June Tate-Gans <jtgans@google.com> Thu Jun 11 16:40:41 2020 -0400
tree ac2ec4193126d37cceee6634ec4d4dc3e32c87f9
parent 0ff9eb049d2fb746ea243ee541d689cc6cb991be

Use force-overwrite during a publish to work around re-adds

Change-Id: I6944ef61e765137e13d9bff992e731882e4d7cd7

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 61d2d23..9689742 100644
--- a/cicd/pipelines/tasks/task_publish_unstable.jenkins
+++ b/cicd/pipelines/tasks/task_publish_unstable.jenkins
@@ -53,8 +53,8 @@
 
                     sh """
                        aptly snapshot merge core-full-unstable-${stamp} ${debianMirrorSnapshotName} ${coreSnapshotName}
-                       aptly publish snapshot --batch --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --architectures=source,amd64,arm64,armhf --distribution=unstable core-full-unstable-${stamp} filesystem:public:unstable
-                       aptly publish snapshot --batch --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --architectures=source,amd64,arm64,armhf --distribution=unstable ${bspSnapshotName} filesystem:public:unstable-bsp-enterprise
+                       aptly publish snapshot --batch --force-replace --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --architectures=source,amd64,arm64,armhf --distribution=unstable core-full-unstable-${stamp} filesystem:public:unstable
+                       aptly publish snapshot --batch --force-replace --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --architectures=source,amd64,arm64,armhf --distribution=unstable ${bspSnapshotName} filesystem:public:unstable-bsp-enterprise
                        """
                 }
             }