From ad764579b5f29948c3bbcc1fcfd20040fcb2dbca Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 27 Oct 2025 11:20:37 -0700 Subject: [PATCH 1/2] Remove reference to deleted core.yml pipeline variable template --- eng/pipelines/release-promotion-official.yml | 4 +--- eng/pipelines/release-staging-official.yml | 5 +---- eng/pipelines/update-readmes.yml | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/release-promotion-official.yml b/eng/pipelines/release-promotion-official.yml index 92a515426e..55892f7957 100644 --- a/eng/pipelines/release-promotion-official.yml +++ b/eng/pipelines/release-promotion-official.yml @@ -2,9 +2,7 @@ trigger: none pr: none variables: -- template: /eng/pipelines/variables/core.yml@self - parameters: - sourceBuildPipelineRunId: "$(resources.pipeline.dotnet-docker-release-staging.runID)" +- template: /eng/pipelines/variables/core-official.yml@self # Set pathArgs to empty in order to publish all images - name: imageBuilder.pathArgs value: "" diff --git a/eng/pipelines/release-staging-official.yml b/eng/pipelines/release-staging-official.yml index fc9e50b490..45f9dfa800 100644 --- a/eng/pipelines/release-staging-official.yml +++ b/eng/pipelines/release-staging-official.yml @@ -29,10 +29,7 @@ parameters: default: true variables: -- template: /eng/pipelines/variables/core.yml@self - parameters: - sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} -- template: /eng/common/templates/variables/dotnet/secrets.yml@self +- template: /eng/pipelines/variables/core-official.yml@self - name: "publicSourceBranch" value: "main" readonly: true diff --git a/eng/pipelines/update-readmes.yml b/eng/pipelines/update-readmes.yml index 48abdbc76a..fd75e8f1c6 100644 --- a/eng/pipelines/update-readmes.yml +++ b/eng/pipelines/update-readmes.yml @@ -2,8 +2,7 @@ trigger: none pr: none variables: -- template: /eng/pipelines/variables/core.yml@self -- template: /eng/common/templates/variables/dotnet/secrets.yml@self +- template: /eng/pipelines/variables/core-official.yml@self extends: template: /eng/common/templates/1es-official.yml@self From c09bd9fea9564ca147f34d77291bc7b6180ac9c2 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 27 Oct 2025 11:43:44 -0700 Subject: [PATCH 2/2] Remove core.yml variable template --- eng/pipelines/variables/core.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 eng/pipelines/variables/core.yml diff --git a/eng/pipelines/variables/core.yml b/eng/pipelines/variables/core.yml deleted file mode 100644 index 3106f0e0c8..0000000000 --- a/eng/pipelines/variables/core.yml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: -# sourceBuildPipelineRunId should be overridden when skipping a build to run -# tests or publish images that were produced in a different pipeline run. -- name: sourceBuildPipelineRunId - type: string - default: "" - -variables: -- template: /eng/common/templates/variables/dotnet/build-test-publish.yml@self - parameters: - sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }} - -- name: manifest - value: manifest.json -- name: publishEolAnnotations - value: true