Skip to content

Commit a02fc48

Browse files
committed
syncing correct secrets for Plus jobs
1 parent 4e0b152 commit a02fc48

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ jobs:
469469
az_tenant_id: ${{ secrets.AZ_KEYVAULT_TENANT_ID }}
470470
az_subscription_id: ${{ secrets.AZ_SUBSCRIPTION_ID }}
471471
keyvault: ${{ secrets.AZ_KEYVAULT_COMMON }}
472-
secrets-filter: 'nginx-private-registry, nginx-pkg-jwt'
472+
secrets-filter: 'docker, nginx-private-registry, nginx-pkg-jwt'
473473

474474
- name: Download Packages
475475
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
@@ -634,12 +634,20 @@ jobs:
634634
with:
635635
name: nginx-agent-unsigned-snapshots
636636
path: build
637+
- name: Sync NGINX Plus License
638+
uses: ./.github/actions/az-sync
639+
with:
640+
az_client_id: ${{ secrets.AZ_KEYVAULT_CLIENT_ID }}
641+
az_tenant_id: ${{ secrets.AZ_KEYVAULT_TENANT_ID }}
642+
az_subscription_id: ${{ secrets.AZ_SUBSCRIPTION_ID }}
643+
keyvault: ${{ secrets.AZ_KEYVAULT_COMMON }}
644+
secrets-filter: 'docker, nginx-private-registry, nginx-pkg-jwt'
637645
- name: Login to Docker Registry
638646
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
639647
with:
640-
registry: ${{ secrets.TEST_REGISTRY_URL }}
641-
username: ${{ secrets.REGISTRY_USERNAME }}
642-
password: ${{ secrets.REGISTRY_PASSWORD }}
648+
registry: ${{ env.nginx-private-registry-url }}
649+
username: ${{ env.nginx-pkg-jwt }}
650+
password: ${{ env.docker-password }}
643651

644652
- name: Create Results Directory
645653
run: mkdir -p ${{ github.workspace }}/test/dashboard/logs/${{ github.job }}/${{matrix.container.image}}-${{matrix.container.version}}
@@ -766,7 +774,7 @@ jobs:
766774
load: true
767775
no-cache: true
768776
secrets: |
769-
"nginx-crt=${{ env.nginx-pkg-cert }}"
777+
"nginx-crt=${{ env.nginx-pkg-certificate }}"
770778
"nginx-key=${{ env.nginx-pkg-key }}"
771779
build-args: |
772780
OSARCH=amd64

0 commit comments

Comments
 (0)