diff options
| author | Brad Warren <bmw@users.noreply.github.com> | 2020-02-06 01:49:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 01:49:01 +0300 |
| commit | 7da5196206b33d5593bd15cd1dcce4d790db7e6d (patch) | |
| tree | 1d56999ce900f7121d34241b3f3b2b23b8ab47a6 | |
| parent | cc764b65c1bb3371389ba2ef7c20176d10b58538 (diff) | |
Add triggers for only a single CI system (#7748)
* Configure travis-test to only run on Travis.
* Configure azure-test to only run on Azure.
* Add docs and comments to keep it up-to-date.
| -rw-r--r-- | .azure-pipelines/advanced.yml | 3 | ||||
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | certbot/docs/contributing.rst | 10 |
3 files changed, 20 insertions, 5 deletions
diff --git a/.azure-pipelines/advanced.yml b/.azure-pipelines/advanced.yml index 44cdf5d54..dda7f9bfd 100644 --- a/.azure-pipelines/advanced.yml +++ b/.azure-pipelines/advanced.yml @@ -1,5 +1,8 @@ # Advanced pipeline for isolated checks and release purpose trigger: + # When changing these triggers, please ensure the documentation under + # "Running tests in CI" is still correct. + - azure-test-* - test-* - '*.x' pr: diff --git a/.travis.yml b/.travis.yml index 0ed6b47af..6c5147603 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,17 +14,19 @@ before_script: - export TOX_TESTENV_PASSENV=TRAVIS # Only build pushes to the master branch, PRs, and branches beginning with -# `test-` or of the form `digit(s).digit(s).x`. This reduces the number of -# simultaneous Travis runs, which speeds turnaround time on review since there -# is a cap of on the number of simultaneous runs. +# `test-`, `travis-test-`, or of the form `digit(s).digit(s).x`. This reduces +# the number of simultaneous Travis runs, which speeds turnaround time on +# review since there is a cap of on the number of simultaneous runs. branches: + # When changing these branches, please ensure the documentation under + # "Running tests in CI" is still correct. only: # apache-parser-v2 is a temporary branch for doing work related to # rewriting the parser in the Apache plugin. - apache-parser-v2 - master - /^\d+\.\d+\.x$/ - - /^test-.*$/ + - /^(travis-)?test-.*$/ # Jobs for the main test suite are always executed (including on PRs) except for pushes on master. not-on-master: ¬-on-master @@ -274,7 +276,7 @@ after_success: '[ "$TOXENV" == "py27-cover" ] && codecov -F linux' notifications: email: false irc: - if: NOT branch =~ ^test-.*$ + if: NOT branch =~ ^(travis-)?test-.*$ channels: # This is set to a secure variable to prevent forks from sending # notifications. This value was created by installing diff --git a/certbot/docs/contributing.rst b/certbot/docs/contributing.rst index c13005a9d..25d832761 100644 --- a/certbot/docs/contributing.rst +++ b/certbot/docs/contributing.rst @@ -201,6 +201,16 @@ using an HTTP-01 challenge on a machine with Python 3: certbot_test certonly --standalone -d test.example.com # To stop Pebble, launch `fg` to get back the background job, then press CTRL+C +Running tests in CI +~~~~~~~~~~~~~~~~~~~ + +Certbot uses both Azure Pipelines and Travis to run continuous integration +tests. If you are using our Azure and Travis setup, a branch whose name starts +with `test-` will run all Azure and Travis tests on that branch. If the branch +name starts with `azure-test-`, it will run all of our Azure tests and none of +our Travis tests. If the branch stats with `travis-test-`, only our Travis +tests will be run. + Code components and layout ========================== |