From 1c0056283f0ab59f1b640d97f690797dff0618cb Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Fri, 6 Oct 2023 17:15:22 -0400
Subject: [PATCH 1/2] use generic debian package meta distro "debian" to imply
 broad compatibility of artifacts in this channel with Debian-based distros

---
 .github/workflows/publish-linux-packages.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish-linux-packages.yml b/.github/workflows/publish-linux-packages.yml
index 4444aeacf..f36d7daf5 100644
--- a/.github/workflows/publish-linux-packages.yml
+++ b/.github/workflows/publish-linux-packages.yml
@@ -93,7 +93,7 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
+          ./release/${{ matrix.package_name }}*.rpm
           /${{ env.ZITI_RPM_TEST_REPO }}/testing/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
@@ -104,7 +104,7 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
+          ./release/${{ matrix.package_name }}*.rpm
           /${{ env.ZITI_RPM_PROD_REPO }}/release/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
@@ -114,9 +114,9 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
+          ./release/${{ matrix.package_name }}*.deb
           /${{ env.ZITI_DEB_TEST_REPO }}/pool/${{ matrix.package_name }}/testing/${{ matrix.arch.deb }}/
-          --deb=testing/main/${{ matrix.arch.deb }}
+          --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true 
 
@@ -126,8 +126,8 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
+          ./release/${{ matrix.package_name }}*.deb
           /${{ env.ZITI_DEB_PROD_REPO }}/pool/${{ matrix.package_name }}/release/${{ matrix.arch.deb }}/
-          --deb=release/main/${{ matrix.arch.deb }}
+          --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true 

From 99bd767f888a7c6979ccc011d28bdc619dedcaf1 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Fri, 6 Oct 2023 17:42:55 -0400
Subject: [PATCH 2/2] organize rpms and debs like release_quality/package_name

---
 .github/workflows/publish-linux-packages.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-linux-packages.yml b/.github/workflows/publish-linux-packages.yml
index f36d7daf5..be0798e1f 100644
--- a/.github/workflows/publish-linux-packages.yml
+++ b/.github/workflows/publish-linux-packages.yml
@@ -94,7 +94,7 @@ jobs:
         run: >
           jf rt upload
           ./release/${{ matrix.package_name }}*.rpm
-          /${{ env.ZITI_RPM_TEST_REPO }}/testing/${{ matrix.arch.rpm }}/
+          /${{ env.ZITI_RPM_TEST_REPO }}/testing/${{ matrix.package_name }}/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
 
@@ -105,7 +105,7 @@ jobs:
         run: >
           jf rt upload
           ./release/${{ matrix.package_name }}*.rpm
-          /${{ env.ZITI_RPM_PROD_REPO }}/release/${{ matrix.arch.rpm }}/
+          /${{ env.ZITI_RPM_PROD_REPO }}/release/${{ matrix.package_name }}/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
 
@@ -115,7 +115,7 @@ jobs:
         run: >
           jf rt upload
           ./release/${{ matrix.package_name }}*.deb
-          /${{ env.ZITI_DEB_TEST_REPO }}/pool/${{ matrix.package_name }}/testing/${{ matrix.arch.deb }}/
+          /${{ env.ZITI_DEB_TEST_REPO }}/pool/testing/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
           --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true 
@@ -127,7 +127,7 @@ jobs:
         run: >
           jf rt upload
           ./release/${{ matrix.package_name }}*.deb
-          /${{ env.ZITI_DEB_PROD_REPO }}/pool/${{ matrix.package_name }}/release/${{ matrix.arch.deb }}/
+          /${{ env.ZITI_DEB_PROD_REPO }}/pool/release/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
           --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true