@@ -615,8 +615,6 @@ jobs:
615615 - build-cli
616616 - can-run-live-tests
617617 if : needs.can-run-live-tests.outputs.access_verified == 'true'
618- env :
619- BICEP_SPN_PASSWORD_FF : ${{ secrets.BICEP_SPN_PASSWORD_FF }}
620618
621619 steps :
622620 - uses : actions/checkout@v3
@@ -638,11 +636,11 @@ jobs:
638636
639637 - name : Az CLI login
640638 uses : azure/login@v1
641- if : matrix.environment == 'prod'
642639 with :
643- client-id : ${{ secrets.LIVE_TEST_CLIENT_ID_PROD }}
644- tenant-id : ${{ secrets.LIVE_TEST_TENANT_ID_PROD }}
645- subscription-id : ${{ secrets.LIVE_TEST_SUBSCRIPTION_ID_PROD }}
640+ environment : ${{ (matrix.environment == 'prod' && 'AzureCloud') || 'AzureUSGovernment' }}
641+ client-id : ${{ (matrix.environment == 'prod' && secrets.LIVE_TEST_CLIENT_ID_PROD) || secrets.LIVE_TEST_CLIENT_ID_FF }}
642+ tenant-id : ${{ (matrix.environment == 'prod' && secrets.LIVE_TEST_TENANT_ID_PROD) || secrets.LIVE_TEST_TENANT_ID_FF }}
643+ subscription-id : ${{ (matrix.environment == 'prod' && secrets.LIVE_TEST_SUBSCRIPTION_ID_PROD) || secrets.LIVE_TEST_SUBSCRIPTION_ID_FF }}
646644
647645 - name : Run Bicep Live E2E Tests (${{ matrix.environment }})
648646 run : npm ci && npm run test:live:${{ matrix.environment }}
@@ -665,8 +663,6 @@ jobs:
665663 - build-cli
666664 - can-run-live-tests
667665 if : needs.can-run-live-tests.outputs.access_verified == 'true'
668- env :
669- BICEP_SPN_PASSWORD_FF : ${{ secrets.BICEP_SPN_PASSWORD_FF }}
670666
671667 steps :
672668 - uses : actions/checkout@v3
@@ -686,11 +682,11 @@ jobs:
686682
687683 - name : Az CLI login
688684 uses : azure/login@v1
689- if : matrix.environment == 'prod'
690685 with :
691- client-id : ${{ secrets.LIVE_TEST_CLIENT_ID_PROD }}
692- tenant-id : ${{ secrets.LIVE_TEST_TENANT_ID_PROD }}
693- subscription-id : ${{ secrets.LIVE_TEST_SUBSCRIPTION_ID_PROD }}
686+ environment : ${{ (matrix.environment == 'prod' && 'AzureCloud') || 'AzureUSGovernment' }}
687+ client-id : ${{ (matrix.environment == 'prod' && secrets.LIVE_TEST_CLIENT_ID_PROD) || secrets.LIVE_TEST_CLIENT_ID_FF }}
688+ tenant-id : ${{ (matrix.environment == 'prod' && secrets.LIVE_TEST_TENANT_ID_PROD) || secrets.LIVE_TEST_TENANT_ID_FF }}
689+ subscription-id : ${{ (matrix.environment == 'prod' && secrets.LIVE_TEST_SUBSCRIPTION_ID_PROD) || secrets.LIVE_TEST_SUBSCRIPTION_ID_FF }}
694690
695691 - name : Run Bicep Live E2E Tests (${{ matrix.environment }})
696692 run : npm ci && npm run test:live:${{ matrix.environment }}
0 commit comments