Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Hydra template/repo usage #38

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Fix Hydra template/repo usage #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pipelines/OneBranch.body.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ stages:
- setup
variables:
TOOLCHAIN_IMAGE: $[ stageDependencies.setup.Setup.outputs['setupEnvironment.TOOLCHAIN_IMAGE'] ]
pipelineBuildTag: $[ stageDependencies.setup.Setup.outputs['setupEnvironment.VERSION_TAG'] ]
jobs:
- job: build_for_codeql
timeoutInMinutes: 30
Expand Down Expand Up @@ -150,14 +149,13 @@ stages:
enable_cache: true # take advantage of multi-stage caching
endpoint: "${{ parameters.acr }}-acr-connection"
arguments: --build-arg ARCH=${{ arch }} --build-arg BUILD_IMAGE=$(TOOLCHAIN_IMAGE)
build_tag: "$(pipelineBuildTag)-${{ arch }}"
build_tag: "$(ESA_BUILD_VERSION)-${{ arch }}"

- stage: publish
dependsOn:
- setup
- build
variables:
pipelineBuildTag: $[ stageDependencies.setup.Setup.outputs['setupEnvironment.VERSION_TAG'] ]
blobCsiVersion: $[ stageDependencies.setup.Setup.outputs['setupEnvironment.BLOB_CSI_VERSION'] ]
HYDRA_REPO_PREFIX: "artifact/$(ServiceTreeId)/$(ONEBRANCH_BUILD_TYPE)/"
jobs:
Expand Down Expand Up @@ -187,6 +185,7 @@ stages:
- template: pipelines/templates/make_images_multiarch.yml@Hydra
parameters:
hydraRepoPrefix: "$(HYDRA_REPO_PREFIX)"
buildTag: $(ESA_BUILD_VERSION)
acr: "${{ parameters.acr }}"
architectures: ${{ parameters.architectures }}
images:
Expand Down Expand Up @@ -214,9 +213,10 @@ stages:
parameters:
condition: and(eq(variables.IsOfficial, 'True'), eq(variables.IsStaging, 'True'), eq(variables['pushLatest'], 'true'))
hydraRepoPrefix: "$(HYDRA_REPO_PREFIX)"
acr: "${{ parameters.acr }}"
dstBuildTag: "$(blobCsiVersion)"
srcBuildTag: "$(pipelineBuildTag)"
srcAcr: "${{ parameters.acr }}"
srcBuildTag: "$(ESA_BUILD_VERSION)"
dstAcr: "${{ parameters.acr }}"
latestTag: "$(blobCsiVersion)"
images:
- $(BlobImageRepo)

Expand Down
Loading