From 920204bce04cb36c859638305634c0a528e20a94 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Wed, 1 May 2024 15:25:26 -0700 Subject: [PATCH] CI: rip out windows tests/jobs --- .../templates/jobs/packaging-jobs.yml | 59 ------------------- .../templates/jobs/standard-tests-jobs.yml | 12 ---- tox.ini | 24 ++------ 3 files changed, 5 insertions(+), 90 deletions(-) diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml index d26f1d4d6..cdf8393c2 100644 --- a/.azure-pipelines/templates/jobs/packaging-jobs.yml +++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml @@ -55,65 +55,6 @@ jobs: - bash: | set -e && tools/docker/test.sh $(dockerTag) $DOCKER_ARCH displayName: Run integration tests for Docker images - - job: installer_build - pool: - vmImage: windows-2019 - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: 3.9 - architecture: x64 - addToPath: true - - script: | - python -m venv venv - venv\Scripts\python tools\pip_install.py -e windows-installer - displayName: Prepare Windows installer build environment - - script: | - venv\Scripts\construct-windows-installer - displayName: Build Certbot installer - - task: CopyFiles@2 - inputs: - sourceFolder: $(System.DefaultWorkingDirectory)/windows-installer/build/nsis - contents: '*.exe' - targetFolder: $(Build.ArtifactStagingDirectory) - - task: PublishPipelineArtifact@1 - inputs: - path: $(Build.ArtifactStagingDirectory) - # If we change the artifact's name, it should also be changed in tools/create_github_release.py - artifact: windows-installer - displayName: Publish Windows installer - - job: installer_run - dependsOn: installer_build - strategy: - matrix: - win2019: - imageName: windows-2019 - pool: - vmImage: $(imageName) - steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: 3.9 - addToPath: true - - task: DownloadPipelineArtifact@2 - inputs: - artifact: windows-installer - path: $(Build.SourcesDirectory)/bin - displayName: Retrieve Windows installer - - script: | - python -m venv venv - venv\Scripts\python tools\pip_install.py -e certbot-ci - env: - PIP_NO_BUILD_ISOLATION: no - displayName: Prepare Certbot-CI - - script: | - set PATH=%ProgramFiles%\Certbot\bin;%PATH% - venv\Scripts\python -m pytest certbot-ci\windows_installer_integration_tests --allow-persistent-changes --installer-path $(Build.SourcesDirectory)\bin\certbot-beta-installer-win_amd64.exe - displayName: Run windows installer integration tests - - script: | - set PATH=%ProgramFiles%\Certbot\bin;%PATH% - venv\Scripts\python -m pytest certbot-ci\certbot_integration_tests\certbot_tests -n 4 - displayName: Run certbot integration tests - job: snaps_build pool: vmImage: ubuntu-22.04 diff --git a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml index 7a9f27a4e..65e6bac94 100644 --- a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml @@ -16,18 +16,6 @@ jobs: TOXENV: cover # See explanation under macos-py38-cover. PIP_USE_PEP517: "true" - windows-py38: - IMAGE_NAME: windows-2019 - PYTHON_VERSION: 3.8 - TOXENV: py-win - windows-py39-cover: - IMAGE_NAME: windows-2019 - PYTHON_VERSION: 3.9 - TOXENV: cover-win - windows-integration-certbot: - IMAGE_NAME: windows-2019 - PYTHON_VERSION: 3.9 - TOXENV: integration-certbot linux-oldest: IMAGE_NAME: ubuntu-22.04 PYTHON_VERSION: 3.8 diff --git a/tox.ini b/tox.ini index 6c2425cf4..280ea2f94 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] # mypy doesn't current pass for us on Windows. Fixing that is being tracked by # https://github.com/certbot/certbot/issues/7803. -envlist = {cover,lint}-{win,posix},mypy +envlist = {cover,lint}-posix,mypy skipsdist = true @@ -10,11 +10,10 @@ pytest = python -m pytest {posargs} # Paths are listed on one line because tox seems to have inconsistent # behavior with substitutions that contain line continuations, see # https://github.com/tox-dev/tox/issues/2069 for more info. -source_paths = acme/acme certbot/certbot certbot-apache/certbot_apache certbot-ci/certbot_integration_tests certbot-ci/snap_integration_tests certbot-ci/windows_installer_integration_tests certbot-compatibility-test/certbot_compatibility_test certbot-dns-cloudflare/certbot_dns_cloudflare certbot-dns-digitalocean/certbot_dns_digitalocean certbot-dns-dnsimple/certbot_dns_dnsimple certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy certbot-dns-gehirn/certbot_dns_gehirn certbot-dns-google/certbot_dns_google certbot-dns-linode/certbot_dns_linode certbot-dns-luadns/certbot_dns_luadns certbot-dns-nsone/certbot_dns_nsone certbot-dns-ovh/certbot_dns_ovh certbot-dns-rfc2136/certbot_dns_rfc2136 certbot-dns-route53/certbot_dns_route53 certbot-dns-sakuracloud/certbot_dns_sakuracloud certbot-nginx/certbot_nginx +source_paths = acme/acme certbot/certbot certbot-apache/certbot_apache certbot-ci/certbot_integration_tests certbot-ci/snap_integration_tests certbot-compatibility-test/certbot_compatibility_test certbot-dns-cloudflare/certbot_dns_cloudflare certbot-dns-digitalocean/certbot_dns_digitalocean certbot-dns-dnsimple/certbot_dns_dnsimple certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy certbot-dns-gehirn/certbot_dns_gehirn certbot-dns-google/certbot_dns_google certbot-dns-linode/certbot_dns_linode certbot-dns-luadns/certbot_dns_luadns certbot-dns-nsone/certbot_dns_nsone certbot-dns-ovh/certbot_dns_ovh certbot-dns-rfc2136/certbot_dns_rfc2136 certbot-dns-route53/certbot_dns_route53 certbot-dns-sakuracloud/certbot_dns_sakuracloud certbot-nginx/certbot_nginx [testenv] platform = - win: win32 posix: ^(?!.*win32).*$ setenv = PYTEST_ADDOPTS = {env:PYTEST_ADDOPTS:--numprocesses auto} @@ -25,7 +24,7 @@ deps = -e acme[test] -e certbot -e certbot[test] - !win: -e certbot-apache[dev] + -e certbot-apache[dev] -e certbot-dns-cloudflare -e certbot-dns-digitalocean -e certbot-dns-dnsimple @@ -49,14 +48,9 @@ commands = echo "Unrecognized environment name {envname}" false -[testenv:py-win] -commands = - {[base]pytest} acme certbot certbot-dns-cloudflare certbot-dns-digitalocean certbot-dns-dnsimple certbot-dns-dnsmadeeasy certbot-dns-gehirn certbot-dns-google certbot-dns-linode certbot-dns-luadns certbot-dns-nsone certbot-dns-ovh certbot-dns-rfc2136 certbot-dns-route53 certbot-dns-sakuracloud certbot-nginx - [testenv:py{,-posix}] -# We want to test everything we do on Windows plus the Apache plugin. commands = - {[testenv:py-win]commands} certbot-apache + {[base]pytest} acme certbot certbot-dns-cloudflare certbot-dns-digitalocean certbot-dns-dnsimple certbot-dns-dnsmadeeasy certbot-dns-gehirn certbot-dns-google certbot-dns-linode certbot-dns-luadns certbot-dns-nsone certbot-dns-ovh certbot-dns-rfc2136 certbot-dns-route53 certbot-dns-sakuracloud certbot-nginx certbot-apache [testenv:py3{,8,9,10,11,12}] commands = {[testenv:py]commands} @@ -77,7 +71,6 @@ commands = {[testenv:py]commands} [testenv:cover] coverage_report = python -m coverage report -# These coverage report commands are used on both posix and windows common_coverage_report_commands = {[testenv:cover]coverage_report} --fail-under 99 --include certbot-dns-cloudflare/* {[testenv:cover]coverage_report} --fail-under 99 --include certbot-dns-digitalocean/* @@ -104,14 +97,7 @@ commands = [testenv:cover-posix] commands = {[testenv:cover]commands} -[testenv:cover-win] -commands = - {[testenv:py-win]commands} --cov --cov-report= - {[testenv:cover]coverage_report} --fail-under 99 --include acme/* - {[testenv:cover]coverage_report} --fail-under 96 --include certbot/* - {[testenv:cover]common_coverage_report_commands} - -[testenv:lint{,-win,-posix}] +[testenv:lint{,-posix}] commands = python -m pylint --reports=n --rcfile=.pylintrc {[base]source_paths} [testenv:mypy]