From 07b037d37b415ab3255815a76647aa8108c36bc1 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Dec 2024 17:22:28 +0000
Subject: [PATCH] jenkins: Copy Debian packages into a subdirectory

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 Jenkinsfile | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e405cb26d..e90fa61c2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -364,40 +364,39 @@ pipeline {
 								steps {
 									// Create a repository and generate Packages
 									sh "mkdir -pv \
-										dists/${DISTRO}/main/binary-${ARCH} \
-										dists/${DISTRO}/main/source \
-										pool/${DISTRO}/main/${ARCH}"
+										packages/debian/dists/${DISTRO}/main/binary-${ARCH} \
+										packages/debian/dists/${DISTRO}/main/source \
+										packages/debian/pool/${DISTRO}/main/${ARCH}"
 
 									// Copy all packages
-									sh "cp -v ../*.deb pool/${DISTRO}/main/${ARCH}"
+									sh "cp -v ../*.deb packages/debian/pool/${DISTRO}/main/${ARCH}"
 
 									// Generate Packages
-									sh "apt-ftparchive packages pool/${DISTRO}/main/${ARCH} \
-										> dists/${DISTRO}/main/binary-${ARCH}/Packages"
+									sh "apt-ftparchive packages packages/debian/pool/${DISTRO}/main/${ARCH} \
+										> packages/debian/dists/${DISTRO}/main/binary-${ARCH}/Packages"
 
 									// Compress Packages
-									sh "xz -v9 < dists/${DISTRO}/main/binary-${ARCH}/Packages \
-										> dists/${DISTRO}/main/binary-${ARCH}/Packages.xz"
+									sh "xz -v9 < packages/debian/dists/${DISTRO}/main/binary-${ARCH}/Packages \
+										> packages/debian/dists/${DISTRO}/main/binary-${ARCH}/Packages.xz"
 
 									// Generate Sources
-									sh "apt-ftparchive sources pool/${DISTRO}/main/${ARCH} \
-										> dists/${DISTRO}/main/source/Sources"
+									sh "apt-ftparchive sources packages/debian/pool/${DISTRO}/main/${ARCH} \
+										> packages/debian/dists/${DISTRO}/main/source/Sources"
 
 									// Compress Sources
-									sh "xz -v9 < dists/${DISTRO}/main/source/Sources \
-										> dists/${DISTRO}/main/source/Sources.xz"
+									sh "xz -v9 < packages/debian/dists/${DISTRO}/main/source/Sources \
+										> packages/debian/dists/${DISTRO}/main/source/Sources.xz"
 
 									// Generate Contents
-									sh "apt-ftparchive contents pool/${DISTRO}/main/${ARCH} \
-										> dists/${DISTRO}/main/Contents-${ARCH}"
+									sh "apt-ftparchive contents packages/debian/pool/${DISTRO}/main/${ARCH} \
+										> packages/debian/dists/${DISTRO}/main/Contents-${ARCH}"
 
 									// Compress Contents
-									sh "xz -v9 < dists/${DISTRO}/main/Contents-${ARCH} \
-										> dists/${DISTRO}/main/Contents-${ARCH}.xz"
+									sh "xz -v9 < packages/debian/dists/${DISTRO}/main/Contents-${ARCH} \
+										> packages/debian/dists/${DISTRO}/main/Contents-${ARCH}.xz"
 
 									// Stash the packages
-									stash includes: "dists/**/*, pool/**/*",
-										name: "${DISTRO}-${ARCH}"
+									stash includes: "packages/debian/**/*", name: "${DISTRO}-${ARCH}"
 								}
 							}
 						}
@@ -411,7 +410,7 @@ pipeline {
 					}
 				}
 
-				stage("Update Debian Repository") {
+				stage("Master Debian Repository") {
 					agent {
 						docker {
 							image "debian:trixie"
@@ -448,14 +447,14 @@ pipeline {
 										echo "Description: Pakfire Jenkins Repository"
 
 										# Do the rest automatically
-										apt-ftparchive release dists/$distro
-									) >> dists/$distro/Release
+										apt-ftparchive release packages/debian/dists/$distro
+									) >> packages/debian/dists/$distro/Release
 								"""
 							}
 						}
 
 						// Upload everything again
-						archiveArtifacts artifacts: "dists/**/*, pool/**/*"
+						archiveArtifacts artifacts: "packages/debian/**/*"
 
 						// XXX This needs to be published on a mirror server somewhere
 					}
-- 
2.39.5