diff --git a/.ci/e2e_integration_test/pipeline.yml b/.ci/e2e_integration_test/pipeline.yml index 3c77eeab..181e7357 100644 --- a/.ci/e2e_integration_test/pipeline.yml +++ b/.ci/e2e_integration_test/pipeline.yml @@ -12,7 +12,8 @@ pool: variables: DOTNET_VERSION: '3.1.x' DOTNET_VERSION_5: '5.0.x' - PYTHON_VERSION: '3.8' + DOTNET_VERSION_6: '6.x' + PYTHON_VERSION: '3.9' steps: - task: UsePythonVersion@0 @@ -21,15 +22,20 @@ steps: versionSpec: $(PYTHON_VERSION) addToPath: true - task: UseDotNet@2 - displayName: 'Install DotNet' + displayName: 'Install DotNet 3' inputs: packageType: 'sdk' version: $(DOTNET_VERSION) - task: UseDotNet@2 - displayName: 'Install DotNet' + displayName: 'Install DotNet 5' inputs: packageType: 'sdk' version: $(DOTNET_VERSION_5) +- task: UseDotNet@2 + displayName: 'Install DotNet 6' + inputs: + packageType: 'sdk' + version: $(DOTNET_VERSION_6) - pwsh: '$(Build.SourcesDirectory)/.ci/e2e_integration_test/start-e2e.ps1' env: AzureWebJobsStorage: $(AzureWebJobsStorage) diff --git a/.ci/e2e_integration_test/start-e2e.ps1 b/.ci/e2e_integration_test/start-e2e.ps1 index 9f4f23bf..450484be 100644 --- a/.ci/e2e_integration_test/start-e2e.ps1 +++ b/.ci/e2e_integration_test/start-e2e.ps1 @@ -5,7 +5,7 @@ # Python worker E2E integration test # The E2E integration test will test the worker against a prerelease version of core tools -$FUNC_RUNTIME_VERSION = '3' +$FUNC_RUNTIME_VERSION = '4' $FUNC_RUNTIME_LANGUAGE = 'python' $AZURE_FUNCTIONS_ENVIRONMENT = "development" $PYAZURE_WEBHOST_DEBUG = "true" @@ -84,6 +84,7 @@ Write-Host "Function Exe Path: $funcExePath" Set-Location $env:BUILD_SOURCESDIRECTORY Write-Host "Set-Location: $env:BUILD_SOURCESDIRECTORY" +Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green Write-Host "Preparing E2E integration tests..." -ForegroundColor Green Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green python -m pip install -U pip @@ -91,7 +92,8 @@ pip install -e .[dev] python setup.py build python setup.py extension Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green - +Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green +Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green Write-Host "Running E2E integration tests..." -ForegroundColor Green Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green $env:CORE_TOOLS_EXE_PATH = "$funcExePath"