Skip to content

Commit 2fbfcca

Browse files
committed
fix artifact folder
1 parent a5557e4 commit 2fbfcca

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.azure-pipelines/test-with-copa.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,21 +200,21 @@ stages:
200200
--file $DOCKERFILE \
201201
$BUILD_SOURCESDIRECTORY
202202
203-
docker save -o "$BUILD_STAGINGDIRECTORY/docker-azure-cli-$(AzCliVersion).tar" $(AzCliImageName):$(AzCliImageTag)
203+
mkdir $(Build.ArtifactStagingDirectory)/docker
204+
docker save -o "$(Build.ArtifactStagingDirectory)/docker/docker-azure-cli-$(AzCliVersion).tar" $(AzCliImageName):$(AzCliImageTag)
204205
205206
displayName: 'Build Docker Image'
206207
207208
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
208209
displayName: 'SBOM'
209-
condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
210210
inputs:
211-
BuildDropPath: $(Build.ArtifactStagingDirectory)
211+
BuildDropPath: $(Build.ArtifactStagingDirectory)/docker
212212
DockerImagesToScan: $(AzCliDockerImageTag)
213213

214214
- task: PublishPipelineArtifact@0
215215
displayName: Publish docker Artifact
216216
inputs:
217-
TargetPath: $(Build.ArtifactStagingDirectory)
217+
TargetPath: $(Build.ArtifactStagingDirectory)/docker
218218
ArtifactName: $(uploadArtifactName)
219219

220220
- stage: Test1
@@ -419,11 +419,11 @@ stages:
419419
inputs:
420420
targetType: 'inline'
421421
script: |
422-
echo "== Check Docker Images =="
423-
docker images
422+
echo "== Check Docker Images =="
423+
docker images
424424
425-
echo "== Run az self-test =="
426-
docker run $(AzCliImageName):$(AzCliImagePatchedTag) /bin/bash -c "time az self-test && time az --version && tdnf list --installed"
425+
echo "== Run az self-test =="
426+
docker run $(AzCliImageName):$(AzCliImagePatchedTag) /bin/bash -c "time az self-test && time az --version && tdnf list --installed"
427427
428428
- task: Bash@3
429429
displayName: Save Patched Docker Image

0 commit comments

Comments
 (0)