pipeline fixes

Author: hallvictoria

azure_functions_worker_v2/requirements.txt

@@ -0,0 +1,2 @@
+# Required dependencies listed in pyproject.toml
+.

azure_functions_worker_v2/tests/unittests/test_code_quality.py

@@ -23,10 +23,6 @@ def test_mypy(self):
                 stderr=subprocess.PIPE,
                 cwd=str(ROOT_PATH))
         except subprocess.CalledProcessError as ex:
-            if (sys.version_info[1] == 7
-                    and sys.version_info[2] == 3):
-                raise unittest.SkipTest('Subprocess start failing for 3.7.3') \
-                    from ex
             output = ex.output.decode()
             raise AssertionError(
                 'mypy validation failed:\n%s', output) from None

eng/ci/official-build.yml

@@ -80,6 +80,7 @@ extends:
 
       # Python V2 Library Build and Test Stages
       - stage: BuildV2Library
+        dependsOn: []
         jobs:
           - template: /eng/templates/official/jobs/build-library.yml@self
             parameters:

eng/ci/public-build.yml

@@ -74,6 +74,7 @@ extends:
 
     # Python V2 Library Build and Test Stages
     - stage: BuildV2Library
+      dependsOn: []
       jobs:
         - template: /eng/templates/jobs/build.yml@self
           parameters:

eng/ci/release.yml renamed to eng/ci/worker-release.yml

@@ -5,6 +5,10 @@ parameters:
     displayName: 'Worker Release (Nuget)'
     type: boolean
     default: false
+  - name: LibraryRelease
+    displayName: 'Library Release (PyPI)'
+    type: boolean
+    default: false
 
 resources:
   repositories:
@@ -34,9 +38,10 @@ extends:
         displayName: 'Release Python Worker (Nuget)'
         jobs:
           - template: /eng/templates/official/jobs/publish-release.yml@self
-            condition: eq(variables['WorkerRelease'], true)
+        condition: eq(${{ parameters.WorkerRelease }}, True)
       - stage: ReleasePythonV2Library
+        dependsOn: []
         displayName: 'Release V2 Library (PyPI)'
         jobs:
           - template: /eng/templates/official/jobs/publish-library-release.yml@self
-            condition: eq(variables['LibraryRelease'], true)
+        condition: eq(${{ parameters.LibraryRelease }}, True)

eng/templates/jobs/ci-library-unit-tests.yml

@@ -27,5 +27,5 @@ jobs:
           python -m pytest -q -n auto --dist loadfile --reruns 4 --instafail --cov=./azure_functions_worker_v2 --cov-report xml --cov-branch tests/unittests
         displayName: "Running $(PYTHON_VERSION) Unit Tests"
         env:
-          AzureWebJobsStorage: $(AzureWebJobsStorage)
+          AzureWebJobsStorage: $(LinuxStorageConnectionString312)
         workingDirectory: $(Build.SourcesDirectory)/${{ parameters.PROJECT_DIRECTORY }}

eng/templates/official/jobs/publish-library-release.yml

@@ -52,7 +52,7 @@ jobs:
   - powershell: |
       $githubUser = "$(GithubUser)"
       $githubToken = "$(GithubPat)"
-      $newLibraryVersion = "$(NewLibraryVersion)"
+      $newLibraryVersion = "$(NewWorkerVersion)"
       $newBranch = "runtime-v2/$newLibraryVersion"
       
       if($newLibraryVersion -match '(\d)+.(\d)+.(\d)+') {
@@ -71,7 +71,7 @@ jobs:
       
           # Modify Runtime Version in pyproject.toml
           Write-Host "Replacing Runtime version in worker's pyproject.toml"
-          ((Get-Content workers/pyproject.toml) -replace '"azure-functions-runtime==(\d)+.(\d)+.*"','"azure-functions-runtime==$(NewLibraryVersion)"' -join "`n") + "`n" | Set-Content -NoNewline workers/pyproject.toml
+          ((Get-Content workers/pyproject.toml) -replace '"azure-functions-runtime==(\d)+.(\d)+.*"','"azure-functions-runtime==$(newLibraryVersion)"' -join "`n") + "`n" | Set-Content -NoNewline workers/pyproject.toml
       
           # Commit Python Version
           Write-Host "Pushing $newBranch to azure-functions-python-worker repo"

eng/templates/official/jobs/publish-release.yml

@@ -177,7 +177,7 @@ jobs:
     displayName: 'Create Host PR for dev'
 
 - job: "CheckHostPRs"
-  dependsOn: ['HostRepoPRs']
+  dependsOn: ['HostRepoPR']
   displayName: '(Manual) Check Host PRs'
   pool: server
   steps:
@@ -187,4 +187,4 @@ jobs:
       notifyUsers: ''
       instructions: |
         Go to https://github.com/Azure/azure-functions-host/pulls and finish the host v4 PR.
-        If the content misses something, checkout "python/x.y.z" from remote and make new commits to it.
+        If the content misses something, checkout "python/x.y.z" from remote and make new commits to it.

eng/templates/shared/github-release-branch.yml

@@ -1,6 +1,4 @@
 parameters:
-  GithubPat: ''
-  NewLibraryVersion: ''
   PROJECT_DIRECTORY: ''
   PROJECT_NAME: ''
   BRANCH_NAME: ''
@@ -9,29 +7,54 @@ steps:
   - powershell: |
       $githubToken = "$(GithubPat)"
       $newWorkerVersion = "$(NewWorkerVersion)"
-      $versionFile = "$PROJECT_NAME/version.py"
+      $versionFile = "${{ parameters.PROJECT_NAME}}/version.py"
+      $newBranch = "${{ parameters.BRANCH_NAME}}/$newWorkerVersion"
       
-      if($newWorkerVersion -match '(\d)+.(\d)+.(\d)+') {
+      if ($newWorkerVersion -match '^(\d+)\.(\d+)\.(\d+)([a-zA-Z0-9\-\.]*)?$') {
           # Create GitHub credential
           git config --global user.name "AzureFunctionsPython"
           git config --global user.email "[email protected]"
+          $credential = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("${githubUser}:${githubToken}"))
       
           # Heading to Artifact Repository
           Write-Host "Operating based on $stagingDirectory/azure-functions-python-worker"
-          git checkout -b "$BRANCH_NAME/$newWorkerVersion"
-          cd $PROJECT_DIRECTORY
+          git checkout -b "$newBranch"
+          cd ${{ parameters.PROJECT_DIRECTORY}}
       
-          # Change $PROJECT_NAME/version.py version
+          # Change ${{ parameters.PROJECT_NAME}}/version.py version
           Write-Host "Change version number in version.py to $newWorkerVersion"
           ((Get-Content $versionFile) -replace "VERSION = '(\d+).(\d+).*'", "VERSION = '$newWorkerVersion'" -join "`n") + "`n" | Set-Content -NoNewline $versionFile
           git add $versionFile
-          git commit -m "build: update $PROJECT_NAME version to $newWorkerVersion"
+          git commit -m "build: update ${{ parameters.PROJECT_NAME}} version to $newWorkerVersion"
       
-          # Create release branch $BRANCH_NAME/X.Y.Z
-          Write-Host "Creating release branch $BRANCH_NAME/$newWorkerVersion"
+          # Create release branch ${{ parameters.BRANCH_NAME}}/X.Y.Z
+          Write-Host "Creating release branch $newBranch"
           git push --repo="https://[email protected]/Azure/azure-functions-python-worker.git"
+
+          # Create PR
+          Write-Host "Creating PR draft in GitHub"
+          $body = @{
+              head = "$newBranch"
+              base = "dev"
+              title = "build: update $($parameters.PROJECT_NAME) version to $newWorkerVersion"
+              body = "Version $newWorkerVersion"
+              draft = $true
+              maintainer_can_modify = $true
+          } | ConvertTo-Json -Compress
+
+          $headers = @{
+              "Authorization" = "Basic $credential"
+              "Content-Type" = "application/json"
+              "Accept" = "application/vnd.github.v3+json"
+              "User-Agent" = "AzureDevOpsPipeline"
+          }
+
+          $response = Invoke-WebRequest -Headers $headers -Method Post -Body $body -Uri "https://api.github.com/repos/Azure/azure-functions-python-worker/pulls"
+      
+          $draftUrl = $response | ConvertFrom-Json | Select -expand url
+          Write-Host "PR draft created in $draftUrl"
       } else {
           Write-Host "NewWorkerVersion $newWorkerVersion is malformed (example: 1.1.8)"
           exit -1
       }
-    displayName: 'Push $BRANCH_NAME/x.y.z'
+    displayName: 'Push ${{ parameters.BRANCH_NAME}}/x.y.z'

eng/templates/shared/github-release-note.yml

@@ -1,59 +1,48 @@
 parameters:
-  GithubPat: ''
-  NewLibraryVersion: ''
   BRANCH_NAME: ''
 
 steps:
   - powershell: |
       $githubToken = "$(GithubPat)"
       $newWorkerVersion = "$(NewWorkerVersion)"
       
-      if($newWorkerVersion -match '(\d)+.(\d)+.(\d)+') {
-          # Create GitHub credential
-          git config --global user.name "AzureFunctionsPython"
-          git config --global user.email "[email protected]"
-      
-          # Clone Repository
-          git clone https://[email protected]/Azure/azure-functions-python-worker
-          Write-Host "Cloned azure-functions-python-worker into local"
-          Set-Location "azure-functions-python-worker"
-          git checkout "origin/$BRANCH_NAME/$newWorkerVersion"
-      
-          # Create release tag X.Y.Z
-          Write-Host "Creating release tag $newWorkerVersion"
-          git tag -a "$newWorkerVersion" -m "$newWorkerVersion"
-      
-          # Push tag to remote
-          git push origin $newWorkerVersion
-      } else {
-          Write-Host "NewWorkerVersion $newWorkerVersion is malformed (example: 1.1.8)"
-          exit -1
-      }
+      # Create GitHub credential
+      git config --global user.name "AzureFunctionsPython"
+      git config --global user.email "[email protected]"
+  
+      # Clone Repository
+      git clone https://[email protected]/Azure/azure-functions-python-worker
+      Write-Host "Cloned azure-functions-python-worker into local"
+      Set-Location "azure-functions-python-worker"
+      git checkout "origin/${{ parameters.BRANCH_NAME}}/$newWorkerVersion"
+  
+      # Create release tag X.Y.Z
+      Write-Host "Creating release tag $newWorkerVersion"
+      git tag -a "$newWorkerVersion" -m "$newWorkerVersion"
+  
+      # Push tag to remote
+
     displayName: 'Create and push release tag x.y.z'
   - powershell: |
       $githubUser = "$(GithubUser)"
       $githubToken = "$(GithubPat)"
       $newWorkerVersion = "$(NewWorkerVersion)"
       
-      if($newWorkerVersion -match '(\d)+.(\d)+.(\d)+') {
-          # Create GitHub credential
-          $credential = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("${githubUser}:${githubToken}"))
-      
-          # Create Release Note
-          Write-Host "Creating release note in GitHub"
-          $body = (@{tag_name="$newWorkerVersion";name="Release $newWorkerVersion";body="- Fill in Release Note Here";draft=$true} | ConvertTo-Json -Compress)
-          $response = Invoke-WebRequest -Headers @{"Cache-Control"="no-cache";"Content-Type"="application/json";"Authorization"="Basic $credential"} -Method Post -Body "$body" -Uri "https://api.github.com/repos/Azure/azure-functions-python-worker/releases"
-      
-          # Return Value
-          if ($response.StatusCode -ne 201) {
-              Write-Host "Failed to create release note in GitHub"
-              exit -1
-          }
-      
-          $draftUrl = $response | ConvertFrom-Json | Select -expand url
-          Write-Host "Release draft created in $draftUrl"
-      } else {
-          Write-Host "NewWorkerVersion $newWorkerVersion is malformed (example: 1.1.8)"
+      # Create GitHub credential
+      $credential = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("${githubUser}:${githubToken}"))
+  
+      # Create Release Note
+      Write-Host "Creating release note in GitHub"
+      $body = (@{tag_name="$newWorkerVersion";name="Release $newWorkerVersion";body="- Fill in Release Note Here";draft=$true} | ConvertTo-Json -Compress)
+      $response = Invoke-WebRequest -Headers @{"Cache-Control"="no-cache";"Content-Type"="application/json";"Authorization"="Basic $credential"} -Method Post -Body "$body" -Uri "https://api.github.com/repos/Azure/azure-functions-python-worker/releases"
+  
+      # Return Value
+      if ($response.StatusCode -ne 201) {
+          Write-Host "Failed to create release note in GitHub"
           exit -1
       }
-    displayName: 'Create GitHub release draft'
+  
+      $draftUrl = $response | ConvertFrom-Json | Select -expand url
+      Write-Host "Release draft created in $draftUrl"
+
+    displayName: 'Create GitHub release draft'