diff --git a/.azure-pipelines/templates/jobs/setup_dependencies.yaml b/.azure-pipelines/templates/jobs/setup_dependencies.yaml index 32d5b9f8e..c5ea41217 100644 --- a/.azure-pipelines/templates/jobs/setup_dependencies.yaml +++ b/.azure-pipelines/templates/jobs/setup_dependencies.yaml @@ -31,13 +31,13 @@ parameters: - 'latestFromBranch' jobs: -- job: SetupDependencies_${{parameters.service}} - displayName: Install ${{parameters.service}} dependencies - dependsOn: SetupImage_${{parameters.service}} +- job: SetupDependencies_${{parameters.serviceName}} + displayName: Install ${{parameters.serviceName}} dependencies + dependsOn: SetupImage_${{parameters.serviceName}} pool: '${{parameters.dependenciesBuildPool}}' container: # TODO: do not use latest on update branches - image: $(buildImageUpstream)/${{parameters.service}}:latest + image: $(buildImageUpstream)/${{parameters.serviceName}}:latest endpoint: devfra env: PROJECT_DIR: $(Build.Repository.LocalPath) @@ -46,11 +46,11 @@ jobs: steps: # Download previously-built dependency artifacts - task: DownloadPipelineArtifact@2 - displayName: Download previously built ${{parameters.service}} dependencies + displayName: Download previously built ${{parameters.serviceName}} dependencies condition: eq(variables.useCachedDependencies, true) continueOnError: true inputs: - artifactName: '${{service}}-dependencies' + artifactName: '${{serviceName}}-dependencies' source: ${{ dependenciesSource }} project: 'Fahrerausbildung' # TODO: hardcoded for now, could not figure out which predefined variable to use pipeline: $(System.DefinitionId) @@ -65,17 +65,17 @@ jobs: - template: .azure-pipelines/templates/steps/make.yaml parameters: makeJob: dependencies - makeService: ${{parameters.service}} + makeService: ${{parameters.serviceName}} # Upload newly-built dependencies as artifacts - task: CopyFiles@2 - displayName: Copy ${{parameters.service}} dependencies for upload + displayName: Copy ${{parameters.serviceName}} dependencies for upload inputs: Contents: ${{ parameters.dependenciesArtifacts }} TargetFolder: '$(Build.ArtifactStagingDirectory)' - task: PublishBuildArtifacts@1 - displayName: Upload ${{parameters.service}} dependencies as artifacts + displayName: Upload ${{parameters.serviceName}} dependencies as artifacts inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' - ArtifactName: '${{parameters.service}}-dependencies' + ArtifactName: '${{parameters.serviceName}}-dependencies' publishLocation: 'Container' \ No newline at end of file