Add contrib and non-free mirrors to the publish routines.
Change-Id: Ic7310336c30b85c3c173af79d218b2c9253ddeb4
diff --git a/cicd/pipelines/tasks/task_publish_unstable.jenkins b/cicd/pipelines/tasks/task_publish_unstable.jenkins
index d2cf1d6..107a24a 100644
--- a/cicd/pipelines/tasks/task_publish_unstable.jenkins
+++ b/cicd/pipelines/tasks/task_publish_unstable.jenkins
@@ -43,7 +43,9 @@
container('debian') {
sh "cp /etc/aptly.conf ~/.aptly.conf"
withEnv(['GNUPGHOME=/var/lib/aptly/.gnupg']) {
- def debianMirrorSnapshotName = getLatestSnapshot('debian-buster')
+ def debianMainMirrorSnapshotName = getLatestSnapshot('debian-buster')
+ def debianContribMirrorSnapshotName = getLatestSnapshot('debian-buster-contrib')
+ def debianNonfreeMirrorSnapshotName = getLatestSnapshot('debian-buster-nonfree')
def coreSnapshotName = getLatestSnapshot('unstable-core')
def bspSnapshotName = getLatestSnapshot('unstable-bsp-enterprise')
def date = new Date()
@@ -52,7 +54,7 @@
installGpgKeyring()
sh """
- aptly snapshot merge core-full-unstable-${stamp} ${debianMirrorSnapshotName} ${coreSnapshotName}
+ aptly snapshot merge core-full-unstable-${stamp} ${debianMainMirrorSnapshotName} ${debianContribMirrorSnapshotName} ${debianNonfreeMirrorSnapshotName} ${coreSnapshotName}
aptly publish snapshot --batch --force-overwrite --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-overwrite --passphrase-file=/var/lib/aptly/keyring/passphrase.txt --architectures=source,amd64,arm64,armhf --distribution=unstable ${bspSnapshotName} filesystem:public:unstable-bsp-enterprise
"""
diff --git a/cicd/pipelines/tasks/task_update_unstable.jenkins b/cicd/pipelines/tasks/task_update_unstable.jenkins
index 4ab1d37..9d26431 100644
--- a/cicd/pipelines/tasks/task_update_unstable.jenkins
+++ b/cicd/pipelines/tasks/task_update_unstable.jenkins
@@ -43,7 +43,9 @@
container('debian') {
sh "cp /etc/aptly.conf ~/.aptly.conf"
withEnv(['GNUPGHOME=/var/lib/aptly/.gnupg']) {
- def debianMirrorSnapshotName = getLatestSnapshot('debian-buster')
+ def debianMainMirrorSnapshotName = getLatestSnapshot('debian-buster')
+ def debianContribMirrorSnapshotName = getLatestSnapshot('debian-buster-contrib')
+ def debianNonfreeMirrorSnapshotName = getLatestSnapshot('debian-buster-non-free')
def coreSnapshotName = getLatestSnapshot('unstable-core')
def bspSnapshotName = getLatestSnapshot('unstable-bsp-enterprise')
def date = new Date()
@@ -52,7 +54,7 @@
installGpgKeyring()
sh """
- aptly snapshot merge core-full-unstable-${stamp} ${debianMirrorSnapshotName} ${coreSnapshotName}
+ aptly snapshot merge --latest core-full-unstable-${stamp} ${debianMainMirrorSnapshotName} ${debianContribMirrorSnapshotName} ${debianNonfreeMirrorSnapshotName} ${coreSnapshotName}
aptly publish switch --batch --force-overwrite --passphrase-file=/var/lib/aptly/keyring/passphrase.txt unstable filesystem:public:unstable core-full-unstable-${stamp}
aptly publish switch --batch --force-overwrite --passphrase-file=/var/lib/aptly/keyring/passphrase.txt unstable filesystem:public:unstable-bsp-enterprise ${bspSnapshotName}
"""
