Merge branch 'v3' into update-pgo-profile

nginx · Oct 2, 2024 · e2ac327 · e2ac327
2 parents d262da3 + f90794c
commit e2ac327
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -144,16 +144,10 @@ jobs:
         with:
           name: nginx-agent-unsigned-snapshots
           path: build
-      - name: Login to Docker Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          registry: ${{ secrets.REGISTRY_URL }}
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
       - name: Run Integration Tests
         run: |
           go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
-          CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" \
+          CONTAINER_NGINX_IMAGE_REGISTRY="docker-registry.nginx.com" \
           TAG="${{ matrix.container.version }}-${{ matrix.container.image }}" \
           OS_RELEASE="${{ matrix.container.release }}" OS_VERSION="${{ matrix.container.version }}" \
             make official-image-integration-test
@@ -312,6 +306,7 @@ jobs:
       - name: Push load test result
         if:  ${{ success() && github.ref_name == 'v3'}}
         run: git push 'https://github-actions:${{ secrets.GITHUB_TOKEN }}@github.com/nginx/agent.git' benchmark-results:benchmark-results
+
   publish-packages-vars:
     name: Set workflow variables
     if: ${{ github.ref_name == 'v3' &&
@@ -324,22 +319,22 @@ jobs:
         id: get_build_num
         run: echo "build_num=${{ github.run_number }}-$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_OUTPUT
 
-  publish-packages:
-    name: Publish NGINX Agent v3 packages
-    if: ${{ github.ref_name == 'v3' &&
-      !github.event.pull_request.head.repo.fork }}
-    needs: [ lint, unit-test, performance-tests,
-             load-tests, official-oss-image-integration-tests,
-             official-plus-image-integration-tests,
-             race-condition-test, publish-packages-vars ]
-    uses: ./.github/workflows/release-branch.yml
-    secrets: inherit
-    permissions:
-      id-token: write
-      contents: read
-    with:
-      packageVersion: "3.0.0"
-      packageBuildNo: "${{ needs.publish-packages-vars.outputs.package_build_num }}"
-      uploadAzure: true
-      publishPackages: true
-      releaseBranch: "v3"
+#  publish-packages:
+#    name: Publish NGINX Agent v3 packages
+#    if: ${{ github.ref_name == 'v3' &&
+#      !github.event.pull_request.head.repo.fork }}
+#    needs: [ lint, unit-test, performance-tests,
+#             load-tests, official-oss-image-integration-tests,
+#             official-plus-image-integration-tests,
+#             race-condition-test, publish-packages-vars ]
+#    uses: ./.github/workflows/release-branch.yml
+#    secrets: inherit
+#    permissions:
+#      id-token: write
+#      contents: read
+#    with:
+#      packageVersion: "3.0.0"
+#      packageBuildNo: "${{ needs.publish-packages-vars.outputs.package_build_num }}"
+#      uploadAzure: true
+#      publishPackages: true
+#      releaseBranch: "v3"
diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml
@@ -264,11 +264,14 @@ jobs:
           build-args: |
             package_type=signed-package
 
+      - name: Set the VERSION environment variable
+        run: echo VERSION=v${{ inputs.packageVersion }} >> $GITHUB_ENV
+
       - name: Build Packages
         env:
           GPG_KEY: ${{ secrets.INDIGO_GPG_AGENT }}
           NFPM_SIGNING_KEY_FILE: .key.asc
-          VERSION: ${{ inputs.packageVersion }}
+          VERSION: ${{ env.VERSION }}
           PACKAGE_BUILD: ${{ inputs.packageBuildNo }}
         run: |
           export PATH=$PATH:~/go/bin