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

Merge pull request #3822 from cevich/simplify_crun_task 

Cirrus: Minor: Simplify crun test task
This commit is contained in:
OpenShift Merge Robot 2019-08-17 08:06:14 +02:00 committed by GitHub
parent 8eab96ec3a 7e406fe8e6
commit 098ce2f33a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.cirrus.yml
View File

@ -349,7 +349,7 @@ testing_task:
audit_log_script: '$SCRIPT_BASE/logcollector.sh audit' audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
journal_script: '$SCRIPT_BASE/logcollector.sh journal' journal_script: '$SCRIPT_BASE/logcollector.sh journal'
# Test crun on last Fedora # Test crun only on latest Fedora
testing_crun_task: testing_crun_task:
depends_on: depends_on:
@ -362,21 +362,15 @@ testing_crun_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: $CIRRUS_CHANGE_MESSAGE !=~ '.*\*\*\*\s*CIRRUS:\s*TEST\s*IMAGES\s*\*\*\*.*' only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\*\*\*\s*CIRRUS:\s*TEST\s*IMAGES\s*\*\*\*.*'
gce_instance:
matrix:
# Images are generated separately, from build_images_task (below)
image_name: "${FEDORA_CACHE_IMAGE_NAME}"
timeout_in: 120m timeout_in: 120m
env: env:
ADD_SECOND_PARTITION: true ADD_SECOND_PARTITION: true
OCI_RUNTIME: "/usr/bin/crun" OCI_RUNTIME: "/usr/bin/crun"
matrix:
TEST_REMOTE_CLIENT: false
networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh' networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
install_crun_script: 'dnf install -y crun'
unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}' unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}'
integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}' integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}' system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
@ -387,11 +381,8 @@ testing_crun_task:
on_failure: on_failure:
failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh' failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
always: &crunstandardlogs always:
ginkgo_node_logs_script: '$SCRIPT_BASE/logcollector.sh ginkgo' <<: *standardlogs
df_script: '$SCRIPT_BASE/logcollector.sh df'
audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
journal_script: '$SCRIPT_BASE/logcollector.sh journal'
# This task executes tests under unique environments/conditions # This task executes tests under unique environments/conditions

5
contrib/cirrus/setup_environment.sh
View File

@ -44,11 +44,6 @@ case "${OS_REL_VER}" in
;; ;;
fedora-30) ;& # continue to next item fedora-30) ;& # continue to next item
fedora-29) fedora-29)
# There is no crun package on Fedora29
if test "${OS_REL_VER}" != "fedora-29"; then
yum install -y crun
fi
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
bash "$SCRIPT_BASE/add_second_partition.sh"; fi bash "$SCRIPT_BASE/add_second_partition.sh"; fi
;; ;;