From c3572048021ecd70bf0bdb7931a8afed4ec8bd2c Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 10 Jan 2019 15:20:05 -0500 Subject: Cirrus: Post-Merge Testing for v1.0 Branch Signed-off-by: Chris Evich --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 199c2a533..c627edea3 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. -- cgit v1.2.3-54-g00ecf