diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-13 21:11:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 21:11:02 +0200 |
| commit | 98708b1268a6083dcb068d6e22d409bd9a47ec62 (patch) | |
| tree | 84d94acaf7a69df953d4bc9ae155e521b2403ccb | |
| parent | 8fef35a2ff64ed130a6b8b08a62f2f07433b4114 (diff) | |
| parent | 23087f77aedcc826dce877c59906dfdfd959ae45 (diff) | |
| download | podman-98708b1268a6083dcb068d6e22d409bd9a47ec62.tar.gz podman-98708b1268a6083dcb068d6e22d409bd9a47ec62.tar.bz2 podman-98708b1268a6083dcb068d6e22d409bd9a47ec62.zip | |
Merge pull request #7967 from cevich/restore_apiv2_test
Cirrus: Restore APIv2 Testing
| -rw-r--r-- | .cirrus.yml | 36 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 4 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 1 |
3 files changed, 33 insertions, 8 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 159f9ea12..c2238c3c6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -407,6 +407,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: @@ -425,6 +426,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 @@ -445,14 +470,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" @@ -613,6 +632,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) ;& |