diff --git a/.ci/e2e_integration_test/pipeline.yml b/.ci/e2e_integration_test/pipeline.yml index 80756db2a..3c77eeabe 100644 --- a/.ci/e2e_integration_test/pipeline.yml +++ b/.ci/e2e_integration_test/pipeline.yml @@ -10,7 +10,8 @@ pool: vmImage: 'ubuntu-latest' variables: - DOTNET_VERSION: '3.1.405' + DOTNET_VERSION: '3.1.x' + DOTNET_VERSION_5: '5.0.x' PYTHON_VERSION: '3.8' steps: @@ -24,6 +25,11 @@ steps: inputs: packageType: 'sdk' version: $(DOTNET_VERSION) +- task: UseDotNet@2 + displayName: 'Install DotNet' + inputs: + packageType: 'sdk' + version: $(DOTNET_VERSION_5) - pwsh: '$(Build.SourcesDirectory)/.ci/e2e_integration_test/start-e2e.ps1' env: AzureWebJobsStorage: $(AzureWebJobsStorage) diff --git a/.github/workflows/ci_e2e_workflow.yml b/.github/workflows/ci_e2e_workflow.yml index 34474769b..006f8b466 100644 --- a/.github/workflows/ci_e2e_workflow.yml +++ b/.github/workflows/ci_e2e_workflow.yml @@ -30,10 +30,14 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Set up Dotnet 3.1.405 + - name: Set up Dotnet 3.1.x uses: actions/setup-dotnet@v1 with: - dotnet-version: '3.1.405' + dotnet-version: '3.1.x' + - name: Set up Dotnet 5.0.x + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' - name: Install dependencies and the worker run: | retry() { diff --git a/.github/workflows/ut_ci_workflow.yml b/.github/workflows/ut_ci_workflow.yml index 72d0f1d63..6fc13a455 100644 --- a/.github/workflows/ut_ci_workflow.yml +++ b/.github/workflows/ut_ci_workflow.yml @@ -27,10 +27,14 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Set up Dotnet 3.1.405 + - name: Set up Dotnet 3.1.x uses: actions/setup-dotnet@v1 with: - dotnet-version: '3.1.405' + dotnet-version: '3.1.x' + - name: Set up Dotnet 5.0.x + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' - name: Install dependencies and the worker run: | retry() { diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a9709d3a7..1f3e78d09 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,6 +7,7 @@ trigger: variables: DOTNET_VERSION: '3.1.405' + DOTNET_VERSION_5: '5.0.x' jobs: - job: Tests @@ -28,10 +29,15 @@ jobs: versionSpec: '$(pythonVersion)' addToPath: true - task: UseDotNet@2 + displayName: 'Install dotnet' inputs: packageType: 'sdk' version: $(DOTNET_VERSION) - displayName: 'Install dotnet' + - task: UseDotNet@2 + displayName: 'Install DotNet 5.x' + inputs: + packageType: 'sdk' + version: $(DOTNET_VERSION_5) - task: ShellScript@2 inputs: disableAutoCwd: true diff --git a/tests/endtoend/test_linux_consumption.py b/tests/endtoend/test_linux_consumption.py index 4400b0c26..f7202400a 100644 --- a/tests/endtoend/test_linux_consumption.py +++ b/tests/endtoend/test_linux_consumption.py @@ -1,4 +1,4 @@ -from unittest import TestCase +from unittest import TestCase, skip import os import sys @@ -9,6 +9,7 @@ ) +@skip('Flaky test and needs stabilization') class TestLinuxConsumption(TestCase): """Test worker behaviors on specific scenarios.