summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2020-10-08 11:47:27 -0400
committerChris Evich <cevich@redhat.com>2020-10-13 11:42:31 -0400
commit23087f77aedcc826dce877c59906dfdfd959ae45 (patch)
treee1b8ceccbe3cf20be425e73af3e0e05ff52e945e
parent7ad631b819d991559ba20e4728a6803a2546158f (diff)
downloadpodman-23087f77aedcc826dce877c59906dfdfd959ae45.tar.gz
podman-23087f77aedcc826dce877c59906dfdfd959ae45.tar.bz2
podman-23087f77aedcc826dce877c59906dfdfd959ae45.zip
Cirrus: Restore APIv2 Testing
Signed-off-by: Chris Evich <cevich@redhat.com>
-rw-r--r--.cirrus.yml36
-rwxr-xr-xcontrib/cirrus/runner.sh4
-rwxr-xr-xcontrib/cirrus/setup_environment.sh1
3 files changed, 33 insertions, 8 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index ab639a59c..a0dc36cf9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -398,6 +398,7 @@ docker-py_test_task:
main_script: *main
always: *artifacts
+
# Does exactly what it says, execute the podman unit-tests on all primary
# platforms and release versions.
unit_test_task:
@@ -415,6 +416,30 @@ unit_test_task:
main_script: *main
always: *artifacts
+
+apiv2_test_task:
+ name: "APIv2 test on $DISTRO_NV"
+ alias: apiv2_test
+ depends_on:
+ - validate
+ gce_instance: *standardvm
+ env:
+ <<: *stdenvars
+ TEST_FLAVOR: apiv2
+ clone_script: *noop # Comes from cache
+ gopath_cache: *ro_gopath_cache
+ setup_script: *setup
+ main_script: *main
+ always: &logs_artifacts
+ <<: *artifacts
+ package_versions_script: '$SCRIPT_BASE/logcollector.sh packages'
+ 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'
+ podman_system_info_script: '$SCRIPT_BASE/logcollector.sh podman'
+
+
# Execute the podman integration tests on all primary platforms and release
# versions, as root, without involving the podman-remote client.
local_integration_test_task: &local_integration_test_task
@@ -434,14 +459,8 @@ local_integration_test_task: &local_integration_test_task
gopath_cache: *ro_gopath_cache
setup_script: *setup
main_script: *main
- always: &logs_artifacts
- <<: *artifacts
- package_versions_script: '$SCRIPT_BASE/logcollector.sh packages'
- 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'
- podman_system_info_script: '$SCRIPT_BASE/logcollector.sh podman'
+ always: *logs_artifacts
+
# Nearly identical to `local_integration_test` except all operations
# are performed through the podman-remote client vs a podman "server"
@@ -598,6 +617,7 @@ success_task:
- osx_alt_build
- docker-py_test
- unit_test
+ - apiv2_test
- local_integration_test
- remote_integration_test
- rootless_integration_test
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index bfac8e7cb..b97a696d9 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -62,6 +62,10 @@ function _run_unit() {
make localunit
}
+function _run_apiv2() {
+ make localapiv2 |& logformatter
+}
+
function _run_int() {
dotest integration
}
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 156c9b7b2..1b992711f 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -165,6 +165,7 @@ case "$TEST_FLAVOR" in
docker-py) ;&
build) make clean ;;
unit) ;;
+ apiv2) ;& # use next item
int) ;&
sys) ;&
bindings) ;&