diff options
author | Matthew Heon <matthew.heon@gmail.com> | 2019-01-10 15:44:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-10 15:44:25 -0500 |
commit | fbed1650fbcc32fb514293d18daa26b5e8029876 (patch) | |
tree | 90eb3062467cca2551da5e67df95376c6618f418 | |
parent | 8e250a82d6581942210225406dad0dd8bfece44e (diff) | |
parent | c3572048021ecd70bf0bdb7931a8afed4ec8bd2c (diff) | |
download | podman-fbed1650fbcc32fb514293d18daa26b5e8029876.tar.gz podman-fbed1650fbcc32fb514293d18daa26b5e8029876.tar.bz2 podman-fbed1650fbcc32fb514293d18daa26b5e8029876.zip |
Merge pull request #2133 from cevich/v1.0
Cirrus: Post-Merge Testing for v1.0 Branch
-rw-r--r-- | .cirrus.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d1029d554..67af6f69a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -104,7 +104,7 @@ build_each_commit_task: - "gating" # $CIRRUS_BASE_BRANCH is only set when testing a PR - only_if: $CIRRUS_BRANCH != 'master' + only_if: $CIRRUS_BRANCH != 'v1.0' gce_instance: image_project: "libpod-218412" @@ -170,7 +170,7 @@ optional_testing_task: # in the PR description. Post-merge system testing is assumed to happen # later from OS distribution's build systems. only_if: >- - $CIRRUS_BRANCH != 'master' && + $CIRRUS_BRANCH != 'v1.0' && $CIRRUS_CHANGE_MESSAGE =~ '.*\*\*\*\s*CIRRUS:\s*SYSTEM\s*TEST\s*\*\*\*.*' gce_instance: @@ -197,7 +197,7 @@ cache_images_task: # Only produce new cache-images after a PR merge, and if a magic string # is present in the most recent commit-message. only_if: >- - $CIRRUS_BRANCH == 'master' && + $CIRRUS_BRANCH == 'v1.0' && $CIRRUS_CHANGE_MESSAGE =~ '.*\*\*\*\s*CIRRUS:\s*REBUILD\s*IMAGES\s*\*\*\*.*' # Require tests to pass first. |