From 6b765f52bd1a012a47d24e0bfbba3244be7003f8 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Tue, 10 Oct 2023 12:18:19 -0400
Subject: [PATCH] normalize RPM repodata depth L2; normalize DEB distribution,
 component, and path

---
 .github/workflows/publish-linux-packages.yml | 9 +++++----
 .github/workflows/release-quickstart.yml     | 3 ++-
 .github/workflows/test-cloudfront-proxy.yml  | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-linux-packages.yml b/.github/workflows/publish-linux-packages.yml
index be0798e1f..951008de1 100644
--- a/.github/workflows/publish-linux-packages.yml
+++ b/.github/workflows/publish-linux-packages.yml
@@ -10,6 +10,7 @@ on:
 
 jobs:
   publish-linux-packages:
+    name: ${{ matrix.package_name }} ${{ matrix.arch.rpm }} ${{ matrix.nfpm_packager }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -94,7 +95,7 @@ jobs:
         run: >
           jf rt upload
           ./release/${{ matrix.package_name }}*.rpm
-          /${{ env.ZITI_RPM_TEST_REPO }}/testing/${{ matrix.package_name }}/${{ matrix.arch.rpm }}/
+          ${{ env.ZITI_RPM_TEST_REPO }}/redhat/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
 
@@ -105,7 +106,7 @@ jobs:
         run: >
           jf rt upload
           ./release/${{ matrix.package_name }}*.rpm
-          /${{ env.ZITI_RPM_PROD_REPO }}/release/${{ matrix.package_name }}/${{ matrix.arch.rpm }}/
+          ${{ env.ZITI_RPM_PROD_REPO }}/redhat/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
 
@@ -115,7 +116,7 @@ jobs:
         run: >
           jf rt upload
           ./release/${{ matrix.package_name }}*.deb
-          /${{ env.ZITI_DEB_TEST_REPO }}/pool/testing/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
+          ${{ env.ZITI_DEB_TEST_REPO }}/pool/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
           --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true 
@@ -127,7 +128,7 @@ jobs:
         run: >
           jf rt upload
           ./release/${{ matrix.package_name }}*.deb
-          /${{ env.ZITI_DEB_PROD_REPO }}/pool/release/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
+          ${{ env.ZITI_DEB_PROD_REPO }}/pool/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
           --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true 
diff --git a/.github/workflows/release-quickstart.yml b/.github/workflows/release-quickstart.yml
index 231a635fd..0127871df 100644
--- a/.github/workflows/release-quickstart.yml
+++ b/.github/workflows/release-quickstart.yml
@@ -14,7 +14,8 @@ jobs:
     # when the ref is release-next the label "quickstartrelease" must be present on the PR for this job to run, and when
     # the ref is a release branch the label is not required
     if: |
-      github.event.pull_request.merged == true
+      github.repository_owner == 'openziti'
+      && github.event.pull_request.merged == true
       && (
         github.ref != 'refs/heads/release-next'
         || contains(github.event.pull_request.labels.*.name, 'quickstartrelease')
diff --git a/.github/workflows/test-cloudfront-proxy.yml b/.github/workflows/test-cloudfront-proxy.yml
index 2745cb3aa..fda9a3826 100644
--- a/.github/workflows/test-cloudfront-proxy.yml
+++ b/.github/workflows/test-cloudfront-proxy.yml
@@ -17,6 +17,7 @@ concurrency:
 jobs:
   test-cloudfront-proxy-function:
     name: CloudFront Proxy Function Dry Run
+    if: github.repository_owner == 'openziti'
     runs-on: ubuntu-latest
     steps:
       - name: Shallow checkout