scripts: Utilise osminversion variable in ccfdd766aa to support multiple minor versio...

diff --git a/scripts/buildserver/packagesync.sh b/scripts/buildserver/packagesync.sh
index 01e276d8572f5165049f5fba0ab8efccd52ea47d..c81ea3e364be260a3aa05e8e0761805db04c3f43 100755 (executable)
--- a/scripts/buildserver/packagesync.sh
+++ b/scripts/buildserver/packagesync.sh
@@ -61,14 +61,14 @@ do
        # rsync --checksum -ave ssh --delete $RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/$packageSyncVersion/$osdistro/$os-$osarch
 
        # Sync SRPMs to S3 bucket:
-       aws s3 sync $SRPM_DIR s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/$packageSyncVersion/$osdistro/$os-$osarch --exclude "*.html" --exclude "repodata"
-       aws s3 sync --delete $SRPM_DIR/repodata/ s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/$packageSyncVersion/$osdistro/$os-$osarch/repodata/ --exclude "*.html"
-       aws cloudfront create-invalidation --distribution-id $CF_SRPM_DISTRO_ID --path /srpms/$packageSyncVersion/$osdistro/$os-$osarch/repodata/*
+       aws s3 sync $SRPM_DIR s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch --exclude "*.html" --exclude "repodata"
+       aws s3 sync --delete $SRPM_DIR/repodata/ s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch/repodata/ --exclude "*.html"
+       aws cloudfront create-invalidation --distribution-id $CF_SRPM_DISTRO_ID --path /srpms/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch/repodata/*
 
        # Sync debug* RPMs to S3 bucket:
-       aws s3 sync $DEBUG_RPM_DIR s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/$packageSyncVersion/$osdistro/$os-$osarch/ --exclude "*.html" --exclude "repodata"
-       aws s3 sync --delete $DEBUG_RPM_DIR/repodata/ s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/$packageSyncVersion/$osdistro/$os-$osarch/repodata/ --exclude "*.html"
-       aws cloudfront create-invalidation --distribution-id $CF_DEBUG_DISTRO_ID --path /debug/$packageSyncVersion/$osdistro/$os-$osarch/repodata/*
+       aws s3 sync $DEBUG_RPM_DIR s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch/ --exclude "*.html" --exclude "repodata"
+       aws s3 sync --delete $DEBUG_RPM_DIR/repodata/ s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch/repodata/ --exclude "*.html"
+       aws cloudfront create-invalidation --distribution-id $CF_DEBUG_DISTRO_ID --path /debug/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch/repodata/*
 done
 
 exit 0

diff --git a/scripts/buildserver/packagesynccommon.sh b/scripts/buildserver/packagesynccommon.sh
index 227b3af9b4be8990e6504d4156e918e3a5257f5e..85548bdb45d540c2ecdd27586745abbf2ce2992e 100755 (executable)
--- a/scripts/buildserver/packagesynccommon.sh
+++ b/scripts/buildserver/packagesynccommon.sh
@@ -43,16 +43,16 @@ echo $GPG_PASSWORD | /usr/bin/gpg2 -a --pinentry-mode loopback --detach-sign --b
 echo $GPG_PASSWORD | /usr/bin/gpg2 -a --pinentry-mode loopback --detach-sign --batch --yes --passphrase-fd 0 $COMMON_DEBUG_RPM_DIR/repodata/repomd.xml
 
 # We currently pull packages from yonada, so skip the next line:
-# rsync --checksum -ave ssh --delete $COMMON_RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/common/$osdistro/$os-$osarch
+# rsync --checksum -ave ssh --delete $COMMON_RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/common/$osdistro/$os.$osminversion-$osarch
 
 # Sync SRPMs to S3 bucket:
-aws s3 sync $COMMON_SRPM_DIR s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/common/$osdistro/$os-$osarch/ --exclude "*.html" --exclude "repodata"
-aws s3 sync --delete $COMMON_SRPM_DIR/repodata/ s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/common/$osdistro/$os-$osarch/repodata/ --exclude "*.html"
-aws cloudfront create-invalidation --distribution-id $CF_SRPM_DISTRO_ID --path /srpms/common/$osdistro/$os-$osarch/repodata/*
+aws s3 sync $COMMON_SRPM_DIR s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/common/$osdistro/$os.$osminversion-$osarch/ --exclude "*.html" --exclude "repodata"
+aws s3 sync --delete $COMMON_SRPM_DIR/repodata/ s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/common/$osdistro/$os.$osminversion-$osarch/repodata/ --exclude "*.html"
+aws cloudfront create-invalidation --distribution-id $CF_SRPM_DISTRO_ID --path /srpms/common/$osdistro/$os.$osminversion-$osarch/repodata/*
 
 # Sync debug* RPMs to S3 bucket:
-aws s3 sync $COMMON_DEBUG_RPM_DIR s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/common/$osdistro/$os-$osarch/ --exclude "*.html" --exclude "repodata"
-aws s3 sync --delete $COMMON_DEBUG_RPM_DIR/repodata/ s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/common/$osdistro/$os-$osarch/repodata/ --exclude "*.html"
-aws cloudfront create-invalidation --distribution-id $CF_DEBUG_DISTRO_ID --path /debug/common/$osdistro/$os-$osarch/repodata/*
+aws s3 sync $COMMON_DEBUG_RPM_DIR s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/common/$osdistro/$os.$osminversion-$osarch/ --exclude "*.html" --exclude "repodata"
+aws s3 sync --delete $COMMON_DEBUG_RPM_DIR/repodata/ s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/common/$osdistro/$os.$osminversion-$osarch/repodata/ --exclude "*.html"
+aws cloudfront create-invalidation --distribution-id $CF_DEBUG_DISTRO_ID --path /debug/common/$osdistro/$os.$osminversion-$osarch/repodata/*
 
 exit 0

diff --git a/scripts/buildserver/packagesyncextras.sh b/scripts/buildserver/packagesyncextras.sh
index f41e9439c9fabcd7e06a0d93eecf7f1113c3fec0..f354fcf090ad039afb14320360b43b8c8de98b29 100755 (executable)
--- a/scripts/buildserver/packagesyncextras.sh
+++ b/scripts/buildserver/packagesyncextras.sh
@@ -51,17 +51,17 @@ echo $GPG_PASSWORD | /usr/bin/gpg2 -a --pinentry-mode loopback --detach-sign --b
 echo $GPG_PASSWORD | /usr/bin/gpg2 -a --pinentry-mode loopback --detach-sign --batch --yes --passphrase-fd 0 $EXTRAS_DEBUG_RPM_DIR/repodata/repomd.xml
 
 #  We currently pull packages from yonada, so skip the next line:
-# rsync -ave ssh --delete $EXTRAS_RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/common/pgdg-$osshort-extras/$osdistro/$os-$osarch
+# rsync -ave ssh --delete $EXTRAS_RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/common/pgdg-$osshort-extras/$osdistro/$os.$osminversion-$osarch
 
 # Sync SRPMs to S3 bucket:
-aws s3 sync $EXTRAS_SRPM_DIR s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/common/pgdg-$osshort-extras/$osdistro/$os-$osarch --exclude "*.html" --exclude "repodata"
-aws s3 sync --delete $EXTRAS_SRPM_DIR/repodata/ s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/common/pgdg-$osshort-extras/$osdistro/$os-$osarch/repodata/ --exclude "*.html"
-aws cloudfront create-invalidation --distribution-id $CF_SRPM_DISTRO_ID --path /srpms/common/pgdg-$osshort-extras/$osdistro/$os-$osarch/repodata/*
+aws s3 sync $EXTRAS_SRPM_DIR s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/common/pgdg-$osshort-extras/$osdistro/$os.$osminversion-$osarch --exclude "*.html" --exclude "repodata"
+aws s3 sync --delete $EXTRAS_SRPM_DIR/repodata/ s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/common/pgdg-$osshort-extras/$osdistro/$os.$osminversion-$osarch/repodata/ --exclude "*.html"
+aws cloudfront create-invalidation --distribution-id $CF_SRPM_DISTRO_ID --path /srpms/common/pgdg-$osshort-extras/$osdistro/$os.$osminversion-$osarch/repodata/*
 
 # Sync debug* RPMs to S3 bucket:
-aws s3 sync $EXTRAS_DEBUG_RPM_DIR s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/common/pgdg-$osshort-extras/$osdistro/$os-$osarch/ --exclude "*.html"
-aws s3 sync --delete $EXTRAS_DEBUG_RPM_DIR/repodata/ s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/common/pgdg-$osshort-extras/$osdistro/$os-$osarch/repodata/ --exclude "*.html"
-aws cloudfront create-invalidation --distribution-id $CF_DEBUG_DISTRO_ID --path /debug/common/pgdg-$osshort-extras/$osdistro/$os-$osarch/repodata/*
+aws s3 sync $EXTRAS_DEBUG_RPM_DIR s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/common/pgdg-$osshort-extras/$osdistro/$os.$osminversion-$osarch/ --exclude "*.html"
+aws s3 sync --delete $EXTRAS_DEBUG_RPM_DIR/repodata/ s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/common/pgdg-$osshort-extras/$osdistro/$os.$osminversion-$osarch/repodata/ --exclude "*.html"
+aws cloudfront create-invalidation --distribution-id $CF_DEBUG_DISTRO_ID --path /debug/common/pgdg-$osshort-extras/$osdistro/$os.$osminversion-$osarch/repodata/*
 
 
 exit 0

diff --git a/scripts/buildserver/packagesyncnonfree.sh b/scripts/buildserver/packagesyncnonfree.sh
index 5c1c1e4a06aafbbcab88c95f3950dce35cd17a15..fb9951158e02bb9c907148c5d344151abea84bba 100755 (executable)
--- a/scripts/buildserver/packagesyncnonfree.sh
+++ b/scripts/buildserver/packagesyncnonfree.sh
@@ -78,15 +78,15 @@ do
        echo $GPG_PASSWORD | /usr/bin/gpg2 -a --pinentry-mode loopback --detach-sign --batch --yes --passphrase-fd 0 $SRPM_DIR/repodata/repomd.xml
 
        # We currently pull packages from yonada, so skip the next line:
-       # rsync --checksum -ave ssh --delete $RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/non-free/$packageSyncVersion/$osdistro/$os-$osarch
-       # rsync --checksum -ave ssh --delete $DEBUG_RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/non-free/debug/$packageSyncVersion/$osdistro/$os-$osarch
-       # rsync --checksum -ave ssh --delete $SRPM_DIR/ yumupload@yum.postgresql.org:yum/yum/srpms/non-free/$packageSyncVersion/$osdistro/$os-$osarch
+       # rsync --checksum -ave ssh --delete $RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/non-free/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch
+       # rsync --checksum -ave ssh --delete $DEBUG_RPM_DIR/ yumupload@yum.postgresql.org:yum/yum/non-free/debug/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch
+       # rsync --checksum -ave ssh --delete $SRPM_DIR/ yumupload@yum.postgresql.org:yum/yum/srpms/non-free/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch
 
        # Sync SRPMs to S3 bucket:
-       aws s3 sync $SRPM_DIR s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/non-free/$packageSyncVersion/$osdistro/$os-$osarch --exclude "*.html"
+       aws s3 sync $SRPM_DIR s3://dnf-srpms.postgresql.org20250313103537584600000001/srpms/non-free/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch --exclude "*.html"
 
        # Sync debug* RPMs to S3 bucket:
-       aws s3 sync $DEBUG_RPM_DIR s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/non-free/$packageSyncVersion/$osdistro/$os-$osarch/ --exclude "*.html"
+       aws s3 sync $DEBUG_RPM_DIR s3://dnf-debuginfo.postgresql.org20250312201116649700000001/debug/non-free/$packageSyncVersion/$osdistro/$os.$osminversion-$osarch/ --exclude "*.html"
 done
 
 exit 0