containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cirrus: refactor Ubuntu and Fedora test tasks 

Refactor Ubuntu and Fedora tests to depend on a common base that isn't a
task, so that we don't run the Ubuntu test matrix-of-scenarios on top of
the Fedora test matrix-of-scenarios, where they would multiply.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2023-03-09 15:35:45 -05:00
parent 68d640111f
commit 3b009a641c
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.cirrus.yml
View File

@ -53,19 +53,31 @@ gce_instance:
image_name: "${FEDORA_CACHE_IMAGE_NAME}" image_name: "${FEDORA_CACHE_IMAGE_NAME}"
fedora_testing_task: &fedora_testing linux_testing: &linux_testing
alias: fedora_testing
name: &std_test_name "${OS_NAME} ${TEST_DRIVER}"
depends_on: depends_on:
- lint - lint
only_if: $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' only_if: $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
gce_instance: # Only need to specify differences from defaults (above) gce_instance: # Only need to specify differences from defaults (above)
image_name: "${VM_IMAGE}" image_name: "${VM_IMAGE}"
# Separate scripts for separate outputs, makes debugging easier.
setup_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
build_and_test_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/build_and_test.sh |& ${_TIMESTAMP}'
always:
df_script: '${_DFCMD} || true'
rh_audit_log_script: '${_RAUDITCMD} || true'
ubuntu_audit_log_script: '${_UAUDITCMD} || true'
journal_log_script: '${_JOURNALCMD} || true'
fedora_testing_task: &fedora_testing
<<: *linux_testing
alias: fedora_testing
name: &std_test_name "${OS_NAME} ${TEST_DRIVER}"
env: env:
OS_NAME: "${FEDORA_NAME}" OS_NAME: "${FEDORA_NAME}"
VM_IMAGE: "${FEDORA_CACHE_IMAGE_NAME}" VM_IMAGE: "${FEDORA_CACHE_IMAGE_NAME}"
# Not all $TEST_DRIVER combinations valid for all $VM_IMAGE types. # Not all $TEST_DRIVER combinations valid for all $VM_IMAGE types.
matrix: &test_matrix matrix: &test_matrix
- env: - env:
@ -81,26 +93,16 @@ fedora_testing_task: &fedora_testing
- env: - env:
TEST_DRIVER: "btrfs" TEST_DRIVER: "btrfs"
# Separate scripts for separate outputs, makes debugging easier.
setup_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'
build_and_test_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/build_and_test.sh |& ${_TIMESTAMP}'
always:
df_script: '${_DFCMD} || true'
rh_audit_log_script: '${_RAUDITCMD} || true'
ubuntu_audit_log_script: '${_UAUDITCMD} || true'
journal_log_script: '${_JOURNALCMD} || true'
# aufs was dropped between 20.04 and 22.04, can't test it # aufs was dropped between 20.04 and 22.04, can't test it
ubuntu_testing_task: &ubuntu_testing ubuntu_testing_task: &ubuntu_testing
<<: *fedora_testing <<: *linux_testing
alias: ubuntu_testing alias: ubuntu_testing
name: *std_test_name name: *std_test_name
only_if: $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
env: env:
OS_NAME: "${UBUNTU_NAME}" OS_NAME: "${UBUNTU_NAME}"
VM_IMAGE: "${UBUNTU_CACHE_IMAGE_NAME}" VM_IMAGE: "${UBUNTU_CACHE_IMAGE_NAME}"
# Not all $TEST_DRIVER combinations valid for all $VM_IMAGE types.
matrix: matrix:
- env: - env:
TEST_DRIVER: "vfs" TEST_DRIVER: "vfs"