Skip to content

Commit 65601f2

Browse files
committed
update test jwt for plus integartion tests
1 parent 0ed7345 commit 65601f2

File tree

1 file changed

+23
-12
lines changed

1 file changed

+23
-12
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -459,17 +459,28 @@ jobs:
459459
~/.cache/go-build
460460
~/go/pkg/mod
461461
key: ${{ runner.os }}-go-
462+
463+
- name: Sync NGINX Plus License
464+
uses: ./.github/actions/az-sync
465+
with:
466+
az_client_id: ${{ secrets.AZ_KEYVAULT_CLIENT_ID }}
467+
az_tenant_id: ${{ secrets.AZ_KEYVAULT_TENANT_ID }}
468+
az_subscription_id: ${{ secrets.AZ_SUBSCRIPTION_ID }}
469+
keyvault: ${{ secrets.AZ_KEYVAULT_COMMON }}
470+
secrets-filter: 'nginx-private-registry, nginx-pkg-jwt'
471+
462472
- name: Download Packages
463473
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
464474
with:
465475
name: nginx-agent-unsigned-snapshots
466476
path: build
477+
467478
- name: Login to Docker Registry
468479
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
469480
with:
470-
registry: ${{ secrets.TEST_REGISTRY_URL }}
471-
username: ${{ secrets.REGISTRY_USERNAME }}
472-
password: ${{ secrets.REGISTRY_PASSWORD }}
481+
registry: ${{ env.nginx-private-registry-url }}
482+
username: ${{ env.nginx-pkg-jwt }}
483+
password: ${{ env.docker-password }}
473484

474485
- name: Create Results Directory
475486
run: mkdir -p ${{ github.workspace }}/test/dashboard/logs/${{ github.job }}/${{matrix.container.image}}-${{matrix.container.version}}
@@ -482,10 +493,10 @@ jobs:
482493
- name: Run Integration Tests
483494
run: |
484495
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
485-
CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.TEST_REGISTRY_URL }}" \
496+
CONTAINER_NGINX_IMAGE_REGISTRY="${{ env.nginx-private-registry-url }}" \
486497
TAG="${{ matrix.container.plus }}-${{ matrix.container.image }}-${{ matrix.container.version }}" \
487498
OS_RELEASE="${{ matrix.container.release }}" OS_VERSION="${{ matrix.container.version }}" IMAGE_PATH="${{ matrix.container.path }}" \
488-
NGINX_LICENSE_JWT='${{ secrets.TEST_JWT }}' \
499+
NGINX_LICENSE_JWT='${{ env.nginx-pkg-jwt }}' \
489500
make official-image-integration-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
490501
exit "${PIPESTATUS[0]}"
491502
@@ -639,10 +650,10 @@ jobs:
639650
- name: Run Integration Tests
640651
run: |
641652
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
642-
CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.TEST_REGISTRY_URL }}" \
653+
CONTAINER_NGINX_IMAGE_REGISTRY="${{ env.nginx-private-registry-url }}" \
643654
TAG="${{ matrix.container.plus }}-${{ matrix.container.image }}-${{ matrix.container.version }}" \
644655
OS_RELEASE="${{ matrix.container.release }}" OS_VERSION="${{ matrix.container.version }}" IMAGE_PATH="${{ matrix.container.path }}" \
645-
NGINX_LICENSE_JWT="${{ secrets.TEST_JWT }}" \
656+
NGINX_LICENSE_JWT="${{ env.nginx-pkg-jwt }}" \
646657
make metrics-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}-${{matrix.container.version}}/raw_logs.log
647658
exit "${PIPESTATUS[0]}"
648659
@@ -738,8 +749,8 @@ jobs:
738749
az_client_id: ${{ secrets.AZ_KEYVAULT_CLIENT_ID }}
739750
az_tenant_id: ${{ secrets.AZ_KEYVAULT_TENANT_ID }}
740751
az_subscription_id: ${{ secrets.AZ_SUBSCRIPTION_ID }}
741-
keyvault: ${{ secrets.AZ_KEYVAULT_AGENT }}
742-
secrets-filter: 'nginx-crt,nginx-key'
752+
keyvault: ${{ secrets.AZ_KEYVAULT_COMMON }}
753+
secrets-filter: 'nginx-pkg'
743754

744755
- name: Build Docker Image
745756
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
@@ -753,8 +764,8 @@ jobs:
753764
load: true
754765
no-cache: true
755766
secrets: |
756-
"nginx-crt=${{ secrets.NGINX_CRT }}"
757-
"nginx-key=${{ secrets.NGINX_KEY }}"
767+
"nginx-crt=${{ env.nginx-pkg-cert }}"
768+
"nginx-key=${{ env.nginx-pkg-key }}"
758769
build-args: |
759770
OSARCH=amd64
760771
GO_VERSION=${{ env.GO_VERSION }}
@@ -787,4 +798,4 @@ jobs:
787798

788799
- name: Push load test result
789800
if: ${{ success() && github.ref_name == 'main' }}
790-
run: git push 'https://github-actions:${{ secrets.GITHUB_TOKEN }}@github.com/nginx/agent.git' benchmark-results:benchmark-results
801+
run: git push 'https://github-actions:${{ github.token }}@github.com/nginx/agent.git' benchmark-results:benchmark-results

0 commit comments

Comments
 (0)