diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-16 15:52:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 15:52:25 +0000 |
| commit | bacb2fc526dba7214e3c8420eccc5cf22bbb1a29 (patch) | |
| tree | 1e0e5dc8f71cacb030cd001734957c87b5370380 /contrib/cirrus/runner.sh | |
| parent | 978c0767fa72abfa41f720f6fab34a62e3ac7a12 (diff) | |
| parent | f66ecc882df822260e41de24b1c5f44a1ba3c3ad (diff) | |
| download | podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.tar.gz podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.tar.bz2 podman-bacb2fc526dba7214e3c8420eccc5cf22bbb1a29.zip | |
Merge pull request #8312 from cevich/new_ubuntu_images
Cirrus: Update VM Images; Both Fedora and Ubuntu "prior" flavors run with CGroupsV1 & runc
Diffstat (limited to 'contrib/cirrus/runner.sh')
| -rwxr-xr-x | contrib/cirrus/runner.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index cc6d155f9..7f9afd1fd 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -41,7 +41,7 @@ function _run_automation() { req_env_vars CI DEST_BRANCH IMAGE_SUFFIX TEST_FLAVOR TEST_ENVIRON \ PODBIN_NAME PRIV_NAME DISTRO_NV CONTAINER USER HOME \ UID AUTOMATION_LIB_PATH SCRIPT_BASE OS_RELEASE_ID \ - OS_RELEASE_VER CG_FS_TYPE + CG_FS_TYPE bigto ooe.sh dnf install -y ShellCheck # small/quick addition $SCRIPT_BASE/shellcheck.sh } @@ -64,12 +64,6 @@ function _run_unit() { } function _run_apiv2() { - # TODO Remove once VM's with dependency - if [[ "$OS_RELEASE_ID" == "fedora" ]]; then - dnf install -y python3-docker - else - apt-get -qq -y install python3-docker - fi make localapiv2 |& logformatter } |