From 51185cc91985e239ad7d67441bf52451af60b61a Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 17 Aug 2020 17:15:37 -0700 Subject: [PATCH] test w/ output --- .../templates/jobs/extended-tests-jobs.yml | 71 ------------------- .../stages/test-and-package-stage.yml | 2 - .../templates/steps/tox-steps.yml | 1 + tests/letstest/targets.yaml | 69 ------------------ 4 files changed, 1 insertion(+), 142 deletions(-) diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml index f74adb05d..77647bb1a 100644 --- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml +++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml @@ -6,77 +6,6 @@ jobs: - group: certbot-common strategy: matrix: - linux-py36: - PYTHON_VERSION: 3.6 - TOXENV: py36 - linux-py37: - PYTHON_VERSION: 3.7 - TOXENV: py37 - linux-py37-nopin: - PYTHON_VERSION: 3.7 - TOXENV: py37 - CERTBOT_NO_PIN: 1 - linux-boulder-v1-integration-certbot-oldest: - TOXENV: integration-certbot-oldest - ACME_SERVER: boulder-v1 - linux-boulder-v2-integration-certbot-oldest: - TOXENV: integration-certbot-oldest - ACME_SERVER: boulder-v2 - linux-boulder-v1-integration-nginx-oldest: - TOXENV: integration-nginx-oldest - ACME_SERVER: boulder-v1 - linux-boulder-v2-integration-nginx-oldest: - TOXENV: integration-nginx-oldest - ACME_SERVER: boulder-v2 - linux-boulder-v1-py27-integration: - PYTHON_VERSION: 2.7 - TOXENV: integration - ACME_SERVER: boulder-v1 - linux-boulder-v2-py27-integration: - PYTHON_VERSION: 2.7 - TOXENV: integration - ACME_SERVER: boulder-v2 - linux-boulder-v1-py36-integration: - PYTHON_VERSION: 3.6 - TOXENV: integration - ACME_SERVER: boulder-v1 - linux-boulder-v2-py36-integration: - PYTHON_VERSION: 3.6 - TOXENV: integration - ACME_SERVER: boulder-v2 - linux-boulder-v1-py37-integration: - PYTHON_VERSION: 3.7 - TOXENV: integration - ACME_SERVER: boulder-v1 - linux-boulder-v2-py37-integration: - PYTHON_VERSION: 3.7 - TOXENV: integration - ACME_SERVER: boulder-v2 - linux-boulder-v1-py38-integration: - PYTHON_VERSION: 3.8 - TOXENV: integration - ACME_SERVER: boulder-v1 - linux-boulder-v2-py38-integration: - PYTHON_VERSION: 3.8 - TOXENV: integration - ACME_SERVER: boulder-v2 - nginx-compat: - TOXENV: nginx_compat - le-auto-centos6: - TOXENV: le_auto_centos6 - le-auto-oraclelinux6: - TOXENV: le_auto_oraclelinux6 - docker-dev: - TOXENV: docker_dev - farmtest-apache2: - PYTHON_VERSION: 3.7 - TOXENV: test-farm-apache2 - farmtest-leauto-upgrades: - PYTHON_VERSION: 3.7 - TOXENV: test-farm-leauto-upgrades - farmtest-certonly-standalone: - PYTHON_VERSION: 3.7 - TOXENV: test-farm-certonly-standalone farmtest-sdists: PYTHON_VERSION: 3.7 TOXENV: test-farm-sdists diff --git a/.azure-pipelines/templates/stages/test-and-package-stage.yml b/.azure-pipelines/templates/stages/test-and-package-stage.yml index 26010644d..f5a10478f 100644 --- a/.azure-pipelines/templates/stages/test-and-package-stage.yml +++ b/.azure-pipelines/templates/stages/test-and-package-stage.yml @@ -1,6 +1,4 @@ stages: - stage: TestAndPackage jobs: - - template: ../jobs/standard-tests-jobs.yml - template: ../jobs/extended-tests-jobs.yml - - template: ../jobs/packaging-jobs.yml diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml index 828552e43..7495a5b0c 100644 --- a/.azure-pipelines/templates/steps/tox-steps.yml +++ b/.azure-pipelines/templates/steps/tox-steps.yml @@ -46,6 +46,7 @@ steps: else python -m tox fi + cat tests/letstest/letest-*/*.log env: AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) diff --git a/tests/letstest/targets.yaml b/tests/letstest/targets.yaml index 711053469..5b4d82729 100644 --- a/tests/letstest/targets.yaml +++ b/tests/letstest/targets.yaml @@ -3,78 +3,9 @@ targets: #----------------------------------------------------------------------------- #Ubuntu - - ami: ami-0758470213bdd23b1 - name: ubuntu20.04 - type: ubuntu - virt: hvm - user: ubuntu - ami: ami-008680ee60f23c94b name: ubuntu20.04_arm64 type: ubuntu virt: hvm user: ubuntu machine_type: a1.medium - - ami: ami-0545f7036167eb3aa - name: ubuntu19.10 - type: ubuntu - virt: hvm - user: ubuntu - - ami: ami-095192256fe1477ad - name: ubuntu18.04LTS - type: ubuntu - virt: hvm - user: ubuntu - #----------------------------------------------------------------------------- - # Debian - - ami: ami-01db78123b2b99496 - name: debian10 - type: ubuntu - virt: hvm - user: admin - #----------------------------------------------------------------------------- - # Other Redhat Distros - - ami: ami-0916c408cb02e310b - name: RHEL7 - type: centos - virt: hvm - user: ec2-user - - ami: ami-0c322300a1dd5dc79 - name: RHEL8 - type: centos - virt: hvm - user: ec2-user - - ami: ami-0fcbe88944a53b4c8 - name: fedora31 - type: centos - virt: hvm - user: fedora - - ami: ami-00bbc6858140f19ed - name: fedora30 - type: centos - virt: hvm - user: fedora - #----------------------------------------------------------------------------- - # CentOS - # These Marketplace AMIs must, irritatingly, have their terms manually - # agreed to on the AWS marketplace site for any new AWS account using them... - - ami: ami-9887c6e7 - name: centos7 - type: centos - virt: hvm - user: centos - # centos6 requires EPEL repo added - - ami: ami-1585c46a - name: centos6 - type: centos - virt: hvm - user: centos - userdata: | - #cloud-config - runcmd: - - yum install -y epel-release - - iptables -F - - ami: ami-01ca03df4a6012157 - name: centos8 - type: centos - virt: hvm - user: centos