summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-17 08:06:14 +0200
committerGitHub <noreply@github.com>2019-08-17 08:06:14 +0200
commit098ce2f33a2117a4b18ef49cacd329d44354f984 (patch)
tree94070d2681b9de68963352cdfef85701b121d200
parent8eab96ec3afdc04c02b5ea1c2067e4a36c14c783 (diff)
parent7e406fe8e6ac39106a51d44026cac8c158d74c0e (diff)
downloadpodman-098ce2f33a2117a4b18ef49cacd329d44354f984.tar.gz
podman-098ce2f33a2117a4b18ef49cacd329d44354f984.tar.bz2
podman-098ce2f33a2117a4b18ef49cacd329d44354f984.zip
Merge pull request #3822 from cevich/simplify_crun_task
Cirrus: Minor: Simplify crun test task
-rw-r--r--.cirrus.yml17
-rwxr-xr-xcontrib/cirrus/setup_environment.sh5
2 files changed, 4 insertions, 18 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index c36479836..5a9dbcb54 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -349,7 +349,7 @@ testing_task:
audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
journal_script: '$SCRIPT_BASE/logcollector.sh journal'
-# Test crun on last Fedora
+# Test crun only on latest Fedora
testing_crun_task:
depends_on:
@@ -362,21 +362,15 @@ testing_crun_task:
# Only test build cache-images, if that's what's requested
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
env:
ADD_SECOND_PARTITION: true
OCI_RUNTIME: "/usr/bin/crun"
- matrix:
- TEST_REMOTE_CLIENT: false
networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh'
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}'
integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}'
@@ -387,11 +381,8 @@ testing_crun_task:
on_failure:
failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
- always: &crunstandardlogs
- ginkgo_node_logs_script: '$SCRIPT_BASE/logcollector.sh ginkgo'
- df_script: '$SCRIPT_BASE/logcollector.sh df'
- audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
- journal_script: '$SCRIPT_BASE/logcollector.sh journal'
+ always:
+ <<: *standardlogs
# This task executes tests under unique environments/conditions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 03acaf1da..7b6765f8a 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -44,11 +44,6 @@ case "${OS_REL_VER}" in
;;
fedora-30) ;& # continue to next item
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
bash "$SCRIPT_BASE/add_second_partition.sh"; fi
;;