Merge pull request #1439 from openziti/release-next

Release 0.30.5

.github/workflows/main.yml

@@ -501,20 +501,6 @@ jobs:
           JFROG_API_KEY: ${{ secrets.JFROG_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  jenkins-smoketest:
-    # BEGIN smoketest-job
-    #
-    # Any event that triggers this main workflow also triggers the smoketest
-    #
-    needs: publish
-    name: Call the On-Demand Smoketest Workflow
-    # not applicable to forks
-    if: github.repository_owner == 'openziti'
-    uses: ./.github/workflows/jenkins-smoketest.yml
-    secrets: inherit
-    with:
-      ziti-version: ${{ needs.publish.outputs.ZITI_VERSION }}
-
   call-publish-prerelease-docker-images:
     # - !cancelled() allows evaluating further conditional expressions even if
     #   needed jobs were skipped

.github/workflows/publish-linux-packages.yml

@@ -10,11 +10,12 @@ on:
 
 jobs:
   publish-linux-packages:
+    name: ${{ matrix.package_name }} ${{ matrix.arch.rpm }} ${{ matrix.nfpm_packager }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         package_name:
-          - ziti-cli
+          - openziti
         arch:
           - goreleaser: amd64
             gox: amd64
@@ -39,8 +40,10 @@ jobs:
       ZITI_HOMEPAGE: "https://openziti.io"
       ZITI_VENDOR: "NetFoundry"
       GOARCH: ${{ matrix.arch.goreleaser }}
-      ZITI_DEB_REPO: ${{ vars.ZITI_DEB_REPO || 'zitipax-openziti-deb-stable' }}
-      ZITI_RPM_REPO: ${{ vars.ZITI_RPM_REPO || 'zitipax-openziti-rpm-stable' }}
+      ZITI_DEB_TEST_REPO: ${{ vars.ZITI_DEB_TEST_REPO || 'zitipax-openziti-deb-test' }}
+      ZITI_DEB_PROD_REPO: ${{ vars.ZITI_DEB_PROD_REPO || 'zitipax-openziti-deb-stable' }}
+      ZITI_RPM_TEST_REPO: ${{ vars.ZITI_RPM_TEST_REPO || 'zitipax-openziti-rpm-test' }}
+      ZITI_RPM_PROD_REPO: ${{ vars.ZITI_RPM_PROD_REPO || 'zitipax-openziti-rpm-stable' }}
     steps:
       - name: Checkout Workspace
         uses: actions/checkout@v3
@@ -91,8 +94,8 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
-          /${{ env.ZITI_RPM_REPO }}/testing/${{ matrix.arch.rpm }}/
+          ./release/${{ matrix.package_name }}*.rpm
+          ${{ env.ZITI_RPM_TEST_REPO }}/redhat/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
 
@@ -102,8 +105,8 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
-          /${{ env.ZITI_RPM_REPO }}/release/${{ matrix.arch.rpm }}/
+          ./release/${{ matrix.package_name }}*.rpm
+          ${{ env.ZITI_RPM_PROD_REPO }}/redhat/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
 
@@ -112,9 +115,9 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
-          /${{ env.ZITI_DEB_REPO }}/pool/${{ matrix.package_name }}/testing/${{ matrix.arch.deb }}/
-          --deb=testing/main/${{ matrix.arch.deb }}
+          ./release/${{ matrix.package_name }}*.deb
+          ${{ env.ZITI_DEB_TEST_REPO }}/pool/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
+          --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true 
 
@@ -124,8 +127,8 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
-          /${{ env.ZITI_DEB_REPO }}/pool/${{ matrix.package_name }}/release/${{ matrix.arch.deb }}/
-          --deb=release/main/${{ matrix.arch.deb }}
+          ./release/${{ matrix.package_name }}*.deb
+          ${{ env.ZITI_DEB_PROD_REPO }}/pool/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
+          --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true 

.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')
@@ -126,7 +127,7 @@ jobs:
       - name: Configure Python
         shell: bash
         run: |
-          pip install --upgrade boto3 jinja2 requests pyyaml
+          pip install --requirement ./dist/cloudfront/get.openziti.io/requirements.txt
           python --version
         
       - name: Deploy the CloudFront Function for get.openziti.io

.github/workflows/test-cloudfront-proxy.yml

@@ -0,0 +1,38 @@
+name: Test CloudFront Proxy Function
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - release-next
+      - main
+      - release-v*
+    paths:
+      - 'dist/cloudfront/get.openziti.io/**'
+
+# cancel older, redundant runs of same workflow on same branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  test-cloudfront-proxy-function:
+    name: CloudFront Proxy Function Dry Run
+    if: github.repository_owner == 'openziti'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Shallow checkout
+        uses: actions/checkout@v3
+
+      - name: Configure Python
+        shell: bash
+        run: |
+          pip install --requirement ./dist/cloudfront/get.openziti.io/requirements.txt
+          python --version
+        
+      - name: Dry Run Deploy CloudFront Function for get.openziti.io
+        shell: bash
+        run: python ./dist/cloudfront/get.openziti.io/deploy-cloudfront-function.py --no-publish
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ vars.AWS_REGION || secrets.AWS_REGION }}