diff --git a/build/aro/webapp-build-artifacts.yml b/build/aro/webapp-build-artifacts.yml index d7beec143..1f34de351 100644 --- a/build/aro/webapp-build-artifacts.yml +++ b/build/aro/webapp-build-artifacts.yml @@ -36,10 +36,6 @@ jobs: modifyOutputPath: true feedsToUse: config nugetConfigPath: src/NuGet.config - - task: PublishPipelineArtifact@1 - inputs: - path: $(Build.ArtifactStagingDirectory) - artifact: drop - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: drop' diff --git a/build/aro/webapp-container-build.yml b/build/aro/webapp-container-build.yml index 28279a4d4..da19b19db 100644 --- a/build/aro/webapp-container-build.yml +++ b/build/aro/webapp-container-build.yml @@ -35,11 +35,14 @@ jobs: $buildExists = $stdout.Contains("$(AppName)-build") Write-Host "##vso[task.setvariable variable=BuildExists;]$buildExists" displayName: 'Check for Existing Build' + - task: DownloadPipelineArtifact@2 + inputs: + artifact: drop - script: 'oc new-build --name=$(AppName)-build dotnet:3.1 --binary=true' failOnStderr: true displayName: 'Create OpenShift Build' condition: and(succeeded(), eq(variables['BuildExists'], False)) - - script: 'oc start-build $(AppName)-build --from-dir="$(Build.ArtifactStagingDirectory)\$(ProjectName)" --follow --wait' + - script: 'oc start-build $(AppName)-build --from-dir="$(Build.ArtifactStagingDirectory)\drop\$(ProjectName)" --follow --wait' failOnStderr: true displayName: 'Start OpenShift Binary Build' continueOnError: true