From 5fecae8bc0dcd56a40b0602ba0926634d5b80281 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Wed, 1 Jul 2020 00:51:14 +0200 Subject: [PATCH] Specific fix considering that the CI is now Azure --- certbot/README.rst | 6 +++--- tests/lock_test.py | 6 +++--- tests/modification-check.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/certbot/README.rst b/certbot/README.rst index 39da06c8a..f0ad6e8cb 100644 --- a/certbot/README.rst +++ b/certbot/README.rst @@ -73,9 +73,9 @@ ACME working area in github: https://github.com/ietf-wg-acme/acme |build-status| -.. |build-status| image:: https://travis-ci.com/certbot/certbot.svg?branch=master - :target: https://travis-ci.com/certbot/certbot - :alt: Travis CI status +.. |build-status| image:: https://img.shields.io/azure-devops/build/certbot/ba534f81-a483-4b9b-9b4e-a60bec8fee72/2/master + :target: https://dev.azure.com/certbot/certbot/_build?definitionId=2 + :alt: Azure Pipelines CI status .. Do not modify this comment unless you know what you're doing. tag:links-end diff --git a/tests/lock_test.py b/tests/lock_test.py index 29a77ae17..ac90e7177 100644 --- a/tests/lock_test.py +++ b/tests/lock_test.py @@ -59,9 +59,9 @@ def set_up(): command = set_up_command(config_dir, logs_dir, work_dir, nginx_dir) dirs = [logs_dir, config_dir, work_dir] - # Travis and Circle CI set CI to true so we - # will always test Nginx's lock during CI - if os.environ.get('CI') == 'true' or util.exe_exists('nginx'): + # A specific environment variable for Azure Pipelines is SYSTEM_TEAMFOUNDATIONSERVERURI. + # If set, then we know we are on a CI job, and we test Nginx's lock. + if os.environ.get('SYSTEM_TEAMFOUNDATIONSERVERURI') == 'true' or util.exe_exists('nginx'): dirs.append(nginx_dir) else: logger.warning('Skipping Nginx lock tests') diff --git a/tests/modification-check.py b/tests/modification-check.py index 811f369d4..473e0900b 100755 --- a/tests/modification-check.py +++ b/tests/modification-check.py @@ -57,7 +57,7 @@ def validate_scripts_content(repo_path, temp_cwd): 'letsencrypt-auto-source/pieces/fetch.py')), temp_cwd) # Compare file against current version in the target branch - branch = os.environ.get('TRAVIS_BRANCH', 'master') + branch = os.environ.get('BUILD_SOURCEBRANCHNAME', 'master') url = ( 'https://raw.githubusercontent.com/certbot/certbot/{0}/certbot-auto' .format(branch))