opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-14 10:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cirrus: special-case CI colon-IMG and colon-DOCS only in subject

Browse Source 
As of a few minutes ago (relative to this commit), Cirrus
defines the CIRRUS_CHANGE_TITLE envariable as "First line
of CIRRUS_CHANGE_MESSAGE"[1]. Replace all conditionals
accordingly.

 [1] f8d2530c60

Reasoning: up until this PR, the presence of CI:IMG
or CI:DOCS *in the body* of the commit message would trigger
those magic CI code flows. This violates POLA, and actually
led to a bad PR (#7317) being merged because CI never ran.

Fixes: #7374

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2020-08-19 10:01:58 -06:00
parent dd4e0da424
commit 71adbcc52e
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
.cirrus.yml
View File

@ -179,8 +179,8 @@ container_image_build_task:
rpmbuild_task: rpmbuild_task:
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' &&
$CIRRUS_BRANCH != $DEST_BRANCH $CIRRUS_BRANCH != $DEST_BRANCH
depends_on: depends_on:
@ -207,8 +207,8 @@ rpmbuild_task:
vendor_task: vendor_task:
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
depends_on: depends_on:
- "gating" - "gating"
@ -239,8 +239,8 @@ vendor_task:
varlink_api_task: varlink_api_task:
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
depends_on: depends_on:
- "gating" - "gating"
@ -278,8 +278,8 @@ build_each_commit_task:
only_if: >- only_if: >-
$CIRRUS_BRANCH != $DEST_BRANCH && $CIRRUS_BRANCH != $DEST_BRANCH &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
gce_instance: gce_instance:
cpu: 8 cpu: 8
@ -310,8 +310,8 @@ build_without_cgo_task:
only_if: >- only_if: >-
$CIRRUS_BRANCH != $DEST_BRANCH && $CIRRUS_BRANCH != $DEST_BRANCH &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
gce_instance: gce_instance:
cpu: 8 cpu: 8
@ -400,8 +400,8 @@ testing_task:
# Only test build cache-images, if that's what's requested # Only test build cache-images, if that's what's requested
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
matrix: matrix:
- name: "test ${FEDORA_NAME}" - name: "test ${FEDORA_NAME}"
@ -463,8 +463,8 @@ special_testing_rootless_task:
- "build_without_cgo" - "build_without_cgo"
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
env: env:
ADD_SECOND_PARTITION: 'true' ADD_SECOND_PARTITION: 'true'
@ -499,8 +499,8 @@ special_testing_in_podman_task:
- "build_without_cgo" - "build_without_cgo"
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
matrix: matrix:
- name: "in-podman ${PRIOR_FEDORA_NAME}" - name: "in-podman ${PRIOR_FEDORA_NAME}"
@ -537,8 +537,8 @@ special_testing_cross_task:
- "vendor" - "vendor"
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
matrix: matrix:
- name: 'cross-platform: windows' - name: 'cross-platform: windows'
@ -575,8 +575,8 @@ special_testing_bindings_task:
- "vendor" - "vendor"
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
env: env:
SPECIALMODE: 'bindings' # See docs SPECIALMODE: 'bindings' # See docs
@ -602,8 +602,8 @@ special_testing_endpoint_task:
- "vendor" - "vendor"
only_if: >- only_if: >-
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
env: env:
SPECIALMODE: 'endpoint' # See docs SPECIALMODE: 'endpoint' # See docs
@ -625,8 +625,8 @@ test_build_cache_images_task:
only_if: >- only_if: >-
$CIRRUS_BRANCH != $DEST_BRANCH && $CIRRUS_BRANCH != $DEST_BRANCH &&
$CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE =~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
depends_on: depends_on:
- "gating" - "gating"
@ -659,8 +659,8 @@ verify_test_built_images_task:
only_if: >- only_if: >-
$CIRRUS_BRANCH != $DEST_BRANCH && $CIRRUS_BRANCH != $DEST_BRANCH &&
$CIRRUS_CHANGE_MESSAGE =~ '.*CI:IMG.*' && $CIRRUS_CHANGE_TITLE =~ '.*CI:IMG.*' &&
$CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
depends_on: depends_on:
@ -700,7 +700,7 @@ verify_test_built_images_task:
docs_task: docs_task:
# Don't run this when building/testing new VM images # Don't run this when building/testing new VM images
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' only_if: $CIRRUS_CHANGE_TITLE !=~ '.*CI:IMG.*'
depends_on: depends_on:
- "gating" - "gating"