From e8f1c97b567464997c8e9953bd4a17f6a55ad457 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 25 Jul 2024 11:57:25 -0400 Subject: [PATCH 1/6] bump vr-approval-cli to 0.4.5 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 54c00ea0c9383..b6e9c5cf89a95 100644 --- a/package.json +++ b/package.json @@ -341,7 +341,7 @@ "tslib": "2.6.3", "typescript": "5.0.4", "vinyl": "2.2.0", - "vr-approval-cli": "0.4.4", + "vr-approval-cli": "0.4.5", "webpack": "5.90.3", "webpack-bundle-analyzer": "4.10.1", "webpack-cli": "5.1.4", diff --git a/yarn.lock b/yarn.lock index 7c74128db8426..3360902642501 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24603,10 +24603,10 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vr-approval-cli@0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/vr-approval-cli/-/vr-approval-cli-0.4.4.tgz#a9377056996a69e2d54fa561118abdf599bab458" - integrity sha512-rQ3nFyHds7gy1paVb1pkQJVJuzf2CJyzvq2g4x1Qe9JQHSgAWITdpD0tfPTvCuwLh6JcZ3z3hTr+sTSHg5976Q== +vr-approval-cli@0.4.5: + version "0.4.5" + resolved "https://registry.yarnpkg.com/vr-approval-cli/-/vr-approval-cli-0.4.5.tgz#315b5708f5a6cd6750887f5983f125dbe2d51169" + integrity sha512-ahZrf0WphWSx3YZ9JtYCO+FCxAuTmryg035k4Nv3DAZV01KjNrXrk8qfRu/uo2NdTizNUjx483pkeZkgihGHXA== dependencies: "@azure/identity" "^4.3.0" "@azure/storage-blob" "12.11.0" From 994ae7a6596c00b955d7118909e82090e22285b7 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 25 Jul 2024 12:03:43 -0400 Subject: [PATCH 2/6] chore: use new create policy API --- azure-pipelines.vrt-pr.yml | 147 ++++++++----------------------------- 1 file changed, 32 insertions(+), 115 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 1f43dbf112c1f..9ed4c1866a465 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -28,37 +28,16 @@ jobs: - template: .devops/templates/tools.yml - bash: | - postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET}) - parsedResponse=${response/*"access_token"/} - token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ - --header 'Authorization: Bearer '"$token" \ - --header 'Content-Type: application/json' \ - --data-raw ' { - "organization": "uifabric", - "projectName": "fabricpublic", - "prId": $(System.PullRequest.PullRequestNumber), - "commitId": "$(Build.SourceVersion)", - "generate":true, - "clientType":"FLUENTUI", - "blockingPipeline":{ - }, - "nonBlockingPipeline":{ - "$(pipelineId)": { - "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" - } - }, - "postPolicy": '${postPolicy}', - "policyType": "OPTIONAL" - }' - displayName: 'Call policy State Api' + set -exuo pipefail + vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' + displayName: VR App - Create Policy env: - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + VR_APP_API_URL: $(VR_APP_API_URL_NEW) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) - template: .devops/templates/runpublishvrscreenshot.yml parameters: @@ -102,37 +81,16 @@ jobs: - template: .devops/templates/tools.yml - bash: | - postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - parsedResponse=${response/*"access_token"/} - token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ - --header 'Authorization: Bearer '"$token" \ - --header 'Content-Type: application/json' \ - --data-raw ' { - "organization": "uifabric", - "projectName": "fabricpublic", - "prId": $(System.PullRequest.PullRequestNumber), - "commitId": "$(Build.SourceVersion)", - "generate":true, - "clientType":"FLUENTUI", - "blockingPipeline":{ - }, - "nonBlockingPipeline":{ - "$(pipelineId)": { - "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" - } - }, - "postPolicy": '${postPolicy}', - "policyType": "OPTIONAL" - }' - displayName: 'Call policy State Api' + set -exuo pipefail + vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' + displayName: VR App - Create Policy env: - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + VR_APP_API_URL: $(VR_APP_API_URL_NEW) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) - template: .devops/templates/runpublishvrscreenshot.yml parameters: @@ -175,37 +133,16 @@ jobs: - template: .devops/templates/tools.yml - bash: | - postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET}) - parsedResponse=${response/*"access_token"/} - token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ - --header 'Authorization: Bearer '"$token" \ - --header 'Content-Type: application/json' \ - --data-raw ' { - "organization": "uifabric", - "projectName": "fabricpublic", - "prId": $(System.PullRequest.PullRequestNumber), - "commitId": "$(Build.SourceVersion)", - "generate":true, - "clientType":"FLUENTUI", - "blockingPipeline":{ - }, - "nonBlockingPipeline":{ - "$(pipelineId)": { - "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" - } - }, - "postPolicy": '${postPolicy}', - "policyType": "OPTIONAL" - }' - displayName: 'Call policy State Api' + set -exuo pipefail + vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' + displayName: VR App - Create Policy env: - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + VR_APP_API_URL: $(VR_APP_API_URL_NEW) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) - template: .devops/templates/runpublishvrscreenshot.yml parameters: @@ -249,36 +186,16 @@ jobs: - template: .devops/templates/tools.yml - bash: | - postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET}) - parsedResponse=${response/*"access_token"/} - token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ - --header 'Authorization: Bearer '"$token" \ - --header 'Content-Type: application/json' \ - --data-raw ' { - "organization": "uifabric", - "projectName": "fabricpublic", - "prId": $(System.PullRequest.PullRequestNumber), - "commitId": "$(Build.SourceVersion)", - "generate":true, - "clientType":"FLUENTUI", - "blockingPipeline":{ - }, - "nonBlockingPipeline":{ - "$(pipelineId)": { - "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" - } - }, - "postPolicy": '${postPolicy}', - "policyType": "OPTIONAL" - }' - displayName: 'Call policy State Api' + set -exuo pipefail + vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' + displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + VR_APP_API_URL: $(VR_APP_API_URL_NEW) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) - template: .devops/templates/runpublishvrscreenshot.yml parameters: From 32c38d262a4cddc7871c70ea2a574ae4c5132772 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 25 Jul 2024 12:12:02 -0400 Subject: [PATCH 3/6] fix: run command with yarn --- azure-pipelines.vrt-pr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 9ed4c1866a465..6e39fb0682bc8 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -29,7 +29,7 @@ jobs: - bash: | set -exuo pipefail - vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' + yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) @@ -82,7 +82,7 @@ jobs: - bash: | set -exuo pipefail - vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' + yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) @@ -134,7 +134,7 @@ jobs: - bash: | set -exuo pipefail - vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' + yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) @@ -187,7 +187,7 @@ jobs: - bash: | set -exuo pipefail - vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' + yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) From ac0267adeb873822b9d93d44752c49ee34401a4b Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 25 Jul 2024 12:42:15 -0400 Subject: [PATCH 4/6] fix: run create-policy after rupublishvrscreenshot --- azure-pipelines.vrt-pr.yml | 48 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 6e39fb0682bc8..c59fe2a9df213 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -27,6 +27,12 @@ jobs: - template: .devops/templates/tools.yml + - template: .devops/templates/runpublishvrscreenshot.yml + parameters: + fluentVersion: webcomponents + vrTestPackageName: '@fluentui/vr-tests-web-components' + vrTestPackagePath: 'apps/vr-tests-web-components' + - bash: | set -exuo pipefail yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' @@ -39,12 +45,6 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - - template: .devops/templates/runpublishvrscreenshot.yml - parameters: - fluentVersion: webcomponents - vrTestPackageName: '@fluentui/vr-tests-web-components' - vrTestPackagePath: 'apps/vr-tests-web-components' - - task: AzureCLI@2 displayName: 'Run fluentui-screenshotdiff' env: @@ -80,6 +80,12 @@ jobs: - template: .devops/templates/tools.yml + - template: .devops/templates/runpublishvrscreenshot.yml + parameters: + fluentVersion: v9 + vrTestPackageName: '@fluentui/vr-tests-react-components' + vrTestPackagePath: 'apps/vr-tests-react-components' + - bash: | set -exuo pipefail yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' @@ -92,12 +98,6 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - - template: .devops/templates/runpublishvrscreenshot.yml - parameters: - fluentVersion: v9 - vrTestPackageName: '@fluentui/vr-tests-react-components' - vrTestPackagePath: 'apps/vr-tests-react-components' - - task: AzureCLI@2 displayName: 'Run fluentui-screenshotdiff' env: @@ -132,6 +132,12 @@ jobs: - template: .devops/templates/tools.yml + - template: .devops/templates/runpublishvrscreenshot.yml + parameters: + fluentVersion: v8 + vrTestPackageName: '@fluentui/vr-tests' + vrTestPackagePath: 'apps/vr-tests' + - bash: | set -exuo pipefail yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' @@ -144,12 +150,6 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - - template: .devops/templates/runpublishvrscreenshot.yml - parameters: - fluentVersion: v8 - vrTestPackageName: '@fluentui/vr-tests' - vrTestPackagePath: 'apps/vr-tests' - - task: AzureCLI@2 displayName: 'Run fluentui-screenshotdiff' env: @@ -185,6 +185,12 @@ jobs: - template: .devops/templates/tools.yml + - template: .devops/templates/runpublishvrscreenshot.yml + parameters: + fluentVersion: v0 + vrTestPackageName: '@fluentui/docs' + vrTestPackagePath: 'packages/fluentui/docs' + - bash: | set -exuo pipefail yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' @@ -197,12 +203,6 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - - template: .devops/templates/runpublishvrscreenshot.yml - parameters: - fluentVersion: v0 - vrTestPackageName: '@fluentui/docs' - vrTestPackagePath: 'packages/fluentui/docs' - - task: AzureCLI@2 displayName: 'Run fluentui-screenshotdiff' env: From e3c0cf52f51f93731273ff61a33c952581eaef87 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 25 Jul 2024 14:52:14 -0400 Subject: [PATCH 5/6] cleanup: variable names --- azure-pipelines.vrt-pr.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index c59fe2a9df213..997a47dc10012 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -39,7 +39,7 @@ jobs: displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL_NEW) + VR_APP_API_URL: $(VR_APP_API_URL) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) @@ -52,7 +52,7 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL_NEW) + VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) @@ -92,7 +92,7 @@ jobs: displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL_NEW) + VR_APP_API_URL: $(VR_APP_API_URL) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) @@ -105,7 +105,7 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL_NEW) + VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) @@ -144,7 +144,7 @@ jobs: displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL_NEW) + VR_APP_API_URL: $(VR_APP_API_URL) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) @@ -157,7 +157,7 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL_NEW) + VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) @@ -197,7 +197,7 @@ jobs: displayName: VR App - Create Policy env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL_NEW) + VR_APP_API_URL: $(VR_APP_API_URL) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) @@ -210,7 +210,7 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL_NEW) + VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) From a44bc87f98aaebc4edfab2893cdd79cb3c1e5101 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Fri, 26 Jul 2024 11:34:37 -0400 Subject: [PATCH 6/6] Remove unused variables --- azure-pipelines.vrt-baseline.yml | 8 -------- azure-pipelines.vrt-pr.yml | 12 ------------ 2 files changed, 20 deletions(-) diff --git a/azure-pipelines.vrt-baseline.yml b/azure-pipelines.vrt-baseline.yml index 648178621a0f6..2c319f768e020 100644 --- a/azure-pipelines.vrt-baseline.yml +++ b/azure-pipelines.vrt-baseline.yml @@ -33,8 +33,6 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) @@ -66,8 +64,6 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) @@ -99,8 +95,6 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) @@ -131,8 +125,6 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 997a47dc10012..fbeb97ed538ef 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -38,7 +38,6 @@ jobs: yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' displayName: VR App - Create Policy env: - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) @@ -50,8 +49,6 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) @@ -91,7 +88,6 @@ jobs: yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' displayName: VR App - Create Policy env: - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) @@ -103,8 +99,6 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) @@ -143,7 +137,6 @@ jobs: yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' displayName: VR App - Create Policy env: - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) @@ -155,8 +148,6 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) @@ -196,7 +187,6 @@ jobs: yarn vr-app create-policy --nonBlockingPipelines '{"$(pipelineId)":{"pipelineStatus": "PENDING","pipelineName": "$(pipelineName)"}}' --clientType 'FLUENTUI' displayName: VR App - Create Policy env: - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) @@ -208,8 +198,6 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId)