diff options
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 68 |
1 files changed, 44 insertions, 24 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1ec825d00..7a306175a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -24,6 +24,11 @@ env: # Runner statistics log file path/name STATS_LOGFILE_SFX: 'runner_stats.log' STATS_LOGFILE: '$GOSRC/${CIRRUS_TASK_NAME}-${STATS_LOGFILE_SFX}' + # Netavark/aardvark location/options when TEST_ENVIRON=host-netavark + NETAVARK_URL: "https://api.cirrus-ci.com/v1/artifact/github/containers/netavark/success/binary.zip?branch=${NETAVARK_BRANCH}" + NETAVARK_DEBUG: 0 # set non-zero to use the debug-mode binary + AARDVARK_URL: "https://api.cirrus-ci.com/v1/artifact/github/containers/aardvark-dns/success/binary.zip?branch=${AARDVARK_BRANCH}" + AARDVARK_DEBUG: 0 # set non-zero to use the debug-mode binary #### #### Cache-image names to test with (double-quotes around names are critical) @@ -515,26 +520,21 @@ container_integration_test_task: main_script: *main always: *int_logs_artifacts -# Run the integration tests using the latest upstream build of netavark. -netavark_integration_test_task: - name: "Netavark integration" # using *std_name_fmt here is unreadable - alias: netavark_integration_test + +# Execute most integration tests as a regular (non-root) user. +rootless_integration_test_task: + name: *std_name_fmt + alias: rootless_integration_test only_if: *not_build skip: *branches_and_tags depends_on: - unit_test + matrix: *platform_axis gce_instance: *standardvm + timeout_in: 90m env: - DISTRO_NV: ${FEDORA_NAME} - _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID} - VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} - CTR_FQIN: ${FEDORA_CONTAINER_FQIN} TEST_FLAVOR: int - TEST_ENVIRON: host-netavark - NETAVARK_URL: "https://api.cirrus-ci.com/v1/artifact/github/containers/netavark/success/binary.zip?branch=${NETAVARK_BRANCH}" - NETAVARK_DEBUG: 0 # set non-zero to use the debug-mode binary - AARDVARK_URL: "https://api.cirrus-ci.com/v1/artifact/github/containers/aardvark-dns/success/binary.zip?branch=${AARDVARK_BRANCH}" - AARDVARK_DEBUG: 0 # set non-zero to use the debug-mode binary + PRIV_NAME: rootless clone_script: *noop # Comes from cache gopath_cache: *ro_gopath_cache setup_script: *setup @@ -542,20 +542,34 @@ netavark_integration_test_task: always: *int_logs_artifacts -# Execute most integration tests as a regular (non-root) user. -rootless_integration_test_task: - name: *std_name_fmt - alias: rootless_integration_test +# Run various scenarios using upstream netavark/aardvark-dns binaries +netavark_task: + name: "Netavark $TEST_FLAVOR $PODBIN_NAME $PRIV_NAME" + alias: netavark only_if: *not_build skip: *branches_and_tags depends_on: - unit_test - matrix: *platform_axis gce_instance: *standardvm - timeout_in: 90m - env: - TEST_FLAVOR: int - PRIV_NAME: rootless + matrix: + - env: &nenv + DISTRO_NV: ${FEDORA_NAME} + _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID} + VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} + CTR_FQIN: ${FEDORA_CONTAINER_FQIN} + TEST_FLAVOR: int + TEST_ENVIRON: host-netavark + - env: + <<: *nenv + TEST_FLAVOR: int + PRIV_NAME: rootless + - env: + <<: *nenv + TEST_FLAVOR: sys + - env: + <<: *nenv + TEST_FLAVOR: sys + PRIV_NAME: rootless clone_script: *noop # Comes from cache gopath_cache: *ro_gopath_cache setup_script: *setup @@ -594,6 +608,7 @@ remote_system_test_task: TEST_FLAVOR: sys PODBIN_NAME: remote + rootless_remote_system_test_task: <<: *local_system_test_task alias: rootless_remote_system_test @@ -614,6 +629,7 @@ rootless_remote_system_test_task: PODBIN_NAME: remote PRIV_NAME: rootless + buildah_bud_test_task: name: *std_name_fmt alias: buildah_bud_test @@ -642,6 +658,7 @@ buildah_bud_test_task: main_script: *main always: *int_logs_artifacts + rootless_system_test_task: name: *std_name_fmt alias: rootless_system_test @@ -660,6 +677,7 @@ rootless_system_test_task: main_script: *main always: *logs_artifacts + rootless_gitlab_test_task: name: *std_name_fmt alias: rootless_gitlab_test @@ -687,6 +705,7 @@ rootless_gitlab_test_task: type: text/xml format: junit + upgrade_test_task: name: "Upgrade test: from $PODMAN_UPGRADE_FROM" alias: upgrade_test @@ -716,6 +735,7 @@ upgrade_test_task: main_script: *main always: *logs_artifacts + # This task is critical. It updates the "last-used by" timestamp stored # in metadata for all VM images. This mechanism functions in tandem with # an out-of-band pruning operation to remove disused VM images. @@ -764,9 +784,9 @@ success_task: - compose_test - local_integration_test - remote_integration_test - - rootless_integration_test - container_integration_test - - netavark_integration_test + - rootless_integration_test + - netavark - local_system_test - remote_system_test - rootless_system_test |