diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bfc57a6f2..a4b8147bc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -200,7 +200,7 @@ jobs: # vmImage: 'vs2017-win2016' name: '1ES-Hosted-AzFunc' # MMS2019TLS for Windows2019 or MMSUbuntu20.04TLS for ubuntu demands: - - ImageOverride -equals MMS2019TLS + - ImageOverride -equals MMSUbuntu20.04TLS steps: - bash: | echo "Releasing from $BUILD_SOURCEBRANCHNAME" @@ -223,6 +223,12 @@ jobs: NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec" WKVERSION="$VERSION-$(patchBuildNumberForDev)" else + # this is only to test nuget related workflow because we are setting nuspec here + echo "Generating Integration Test Package for $BUILD_SOURCEBRANCHNAME for testing purpose" + LATEST_TAG=$(curl https://api.github.com/repos/Azure/azure-functions-python-worker/tags -s | jq '.[0].name' | sed 's/\"//g' | cut -d'.' -f-2) + NUSPEC="pack\Microsoft.Azure.Functions.V3.PythonWorker.nuspec" + # Only required for Integration Test. Version number contains date (e.g. 3.1.2.20211028-dev) + WKVERSION="3.$LATEST_TAG-$(BUILD_BUILDID)-TEST" echo "No Matching Release Tag For $BUILD_SOURCEBRANCH" fi @@ -237,8 +243,8 @@ jobs: - task: ManifestGeneratorTask@0 displayName: 'SBOM Generation Task' inputs: - BuildDropPath: '$(Build.ArtifactStagingDirectory)' - BuildComponentPath: '$(Build.ArtifactStagingDirectory)' + BuildDropPath: '$(Build.SourcesDirectory)' + BuildComponentPath: '$(Build.SourcesDirectory)' Verbosity: 'Verbose' - task: NuGetCommand@2 inputs: diff --git a/pack/Microsoft.Azure.Functions.V2.PythonWorker.nuspec b/pack/Microsoft.Azure.Functions.V2.PythonWorker.nuspec index 95fd5b30c..b8b5eea53 100644 --- a/pack/Microsoft.Azure.Functions.V2.PythonWorker.nuspec +++ b/pack/Microsoft.Azure.Functions.V2.PythonWorker.nuspec @@ -20,7 +20,7 @@ - - + + diff --git a/pack/Microsoft.Azure.Functions.V3.PythonWorker.nuspec b/pack/Microsoft.Azure.Functions.V3.PythonWorker.nuspec index f2da70b8a..06add8a27 100644 --- a/pack/Microsoft.Azure.Functions.V3.PythonWorker.nuspec +++ b/pack/Microsoft.Azure.Functions.V3.PythonWorker.nuspec @@ -28,7 +28,7 @@ - - + +