From 6851da475ae689ea87ce5b41c4f1998cf902b429 Mon Sep 17 00:00:00 2001 From: Adrian Date: Wed, 19 Nov 2025 12:15:13 -0600 Subject: [PATCH 1/5] updating capture open --- .azure-pipelines/generation-templates/capture-openapi.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines/generation-templates/capture-openapi.yml b/.azure-pipelines/generation-templates/capture-openapi.yml index f8d534a22..7adc6b2bb 100644 --- a/.azure-pipelines/generation-templates/capture-openapi.yml +++ b/.azure-pipelines/generation-templates/capture-openapi.yml @@ -12,6 +12,8 @@ parameters: default: $(System.ArtifactsDirectory) - name: 'cleanMetadataFolder' type: string +- name: 'skipOpenAPIPRGeneration' + type: boolean jobs: - job: get_conversion_settings displayName: "Get conversion settings" From aae39a935c8ae25239a41221bf017bdbccc580d6 Mon Sep 17 00:00:00 2001 From: Adrian Date: Wed, 19 Nov 2025 12:19:47 -0600 Subject: [PATCH 2/5] changing back to parameters --- .azure-pipelines/generation-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/generation-pipeline.yml b/.azure-pipelines/generation-pipeline.yml index 976da487b..39280ede9 100644 --- a/.azure-pipelines/generation-pipeline.yml +++ b/.azure-pipelines/generation-pipeline.yml @@ -292,7 +292,7 @@ extends: endpoint: 'v1.0' outputPath: $(cleanOpenAPIFileV1OutputPath) cleanMetadataFolder: $(cleanOpenAPIFolderV1) - skipOpenAPIPRGeneration: $(skipOpenAPIPRGeneration) + skipOpenAPIPRGeneration: ${{ parameters.skipOpenAPIPRGeneration}} - stage: stage_beta_openapi dependsOn: stage_beta_metadata @@ -303,7 +303,7 @@ extends: endpoint: 'beta' outputPath: $(cleanOpenAPIFileBetaOutputPath) cleanMetadataFolder: $(cleanOpenAPIFolderBeta) - skipOpenAPIPRGeneration: $(skipOpenAPIPRGeneration) + skipOpenAPIPRGeneration: ${{ parameters.skipOpenAPIPRGeneration}} # Approval stage for v1 OpenAPI generation. All subsequent stages depending on OpenAPI generation # will be blocked until approval is granted. Any new stages depending on OpenAPI generation From a7582c2d9fa8004f4b940a4b80a86f634ae9ccd8 Mon Sep 17 00:00:00 2001 From: Adrian Date: Wed, 19 Nov 2025 13:51:51 -0600 Subject: [PATCH 3/5] changing condition positioning --- .azure-pipelines/generation-templates/capture-openapi.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure-pipelines/generation-templates/capture-openapi.yml b/.azure-pipelines/generation-templates/capture-openapi.yml index 7adc6b2bb..3d5fc6c04 100644 --- a/.azure-pipelines/generation-templates/capture-openapi.yml +++ b/.azure-pipelines/generation-templates/capture-openapi.yml @@ -105,7 +105,6 @@ jobs: - job: publish_openapi dependsOn: convert_openapi displayName: Publish OpenAPI files - condition: eq('${{ parameters.skipOpenAPIPRGeneration }}', false) ## If there's new settings added please add them here too templateContext: inputs: @@ -180,7 +179,7 @@ jobs: displayName: 'Create Pull Request for the generated OpenAPI files for msgraph-metadata' env: BaseBranch: master - GeneratePullRequest: true + GeneratePullRequest: not('${{ parameters.skipOpenAPIPRGeneration }}') GhAppId: $(microsoft-graph-devx-bot-appid) GhAppKey: $(microsoft-graph-devx-bot-privatekey) OverrideSkipCI: false From d5f3a5772d86dec7cf73f0233015e2c3ec4d12ae Mon Sep 17 00:00:00 2001 From: Adrian Date: Wed, 19 Nov 2025 15:54:40 -0600 Subject: [PATCH 4/5] updating conditions --- .azure-pipelines/generation-templates/capture-openapi.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/generation-templates/capture-openapi.yml b/.azure-pipelines/generation-templates/capture-openapi.yml index 3d5fc6c04..b4681161a 100644 --- a/.azure-pipelines/generation-templates/capture-openapi.yml +++ b/.azure-pipelines/generation-templates/capture-openapi.yml @@ -156,9 +156,10 @@ jobs: # Push changes to msgraph-metadata repo - pwsh: '$(scriptsDirectory)/git-push-cleanmetadata.ps1' + condition: not('${{ parameters.skipOpenAPIPRGeneration }}') displayName: Publish ${{ parameters.endpoint }} OpenAPI description to msgraph-metadata repo env: - CreateOpenAPIPR: True + CreateOpenAPIPR: true EndpointVersion: ${{ parameters.endpoint }} PublishChanges: $(publishChanges) workingDirectory: '$(Build.SourcesDirectory)/msgraph-metadata' @@ -176,10 +177,11 @@ jobs: SecretsFilter: "microsoft-graph-devx-bot-appid,microsoft-graph-devx-bot-privatekey" - pwsh: '$(scriptsDirectory)/create-pull-request.ps1' + condition: not('${{ parameters.skipOpenAPIPRGeneration }}') displayName: 'Create Pull Request for the generated OpenAPI files for msgraph-metadata' env: BaseBranch: master - GeneratePullRequest: not('${{ parameters.skipOpenAPIPRGeneration }}') + GeneratePullRequest: true GhAppId: $(microsoft-graph-devx-bot-appid) GhAppKey: $(microsoft-graph-devx-bot-privatekey) OverrideSkipCI: false From f1f0287836de10f0f2dfa9d5d65fd9b7eb633fab Mon Sep 17 00:00:00 2001 From: Adrian Date: Fri, 21 Nov 2025 09:38:52 -0600 Subject: [PATCH 5/5] reverting back --- .azure-pipelines/generation-templates/capture-openapi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/generation-templates/capture-openapi.yml b/.azure-pipelines/generation-templates/capture-openapi.yml index b4681161a..1f6401ce0 100644 --- a/.azure-pipelines/generation-templates/capture-openapi.yml +++ b/.azure-pipelines/generation-templates/capture-openapi.yml @@ -159,7 +159,7 @@ jobs: condition: not('${{ parameters.skipOpenAPIPRGeneration }}') displayName: Publish ${{ parameters.endpoint }} OpenAPI description to msgraph-metadata repo env: - CreateOpenAPIPR: true + CreateOpenAPIPR: True EndpointVersion: ${{ parameters.endpoint }} PublishChanges: $(publishChanges) workingDirectory: '$(Build.SourcesDirectory)/msgraph-metadata'