diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-08 05:13:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 05:13:10 -0400 |
| commit | 48d49032a1e788ef915eb378cd5ccbee0533e2aa (patch) | |
| tree | 452372cbcbddfcd3e63040082e8091c570f5045e /contrib | |
| parent | 1a9cb93f16cf19e14581319e2fd1b60e791f74dd (diff) | |
| parent | 2c7c679584d9c13040b5633e1d2db5847416cdea (diff) | |
| download | podman-48d49032a1e788ef915eb378cd5ccbee0533e2aa.tar.gz podman-48d49032a1e788ef915eb378cd5ccbee0533e2aa.tar.bz2 podman-48d49032a1e788ef915eb378cd5ccbee0533e2aa.zip | |
Merge pull request #10865 from Luap99/rootless-cni
Make rootless-cni setup more robust
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/runner.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index cac679466..da43ffb0a 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -173,7 +173,7 @@ function _run_swagger() { trap "rm -f $envvarsfile" EXIT # contains secrets # Warning: These values must _not_ be quoted, podman will not remove them. #shellcheck disable=SC2154 - cat <<eof>>$envvarsfile + cat <<eof >>$envvarsfile GCPJSON=$GCPJSON GCPNAME=$GCPNAME GCPPROJECT=$GCPPROJECT @@ -336,6 +336,11 @@ msg "************************************************************" # shellcheck disable=SC2154 if [[ "$PRIV_NAME" == "rootless" ]] && [[ "$UID" -eq 0 ]]; then + # Remove /var/lib/cni, it is not required for rootless cni. + # We have to test that it works without this directory. + # https://github.com/containers/podman/issues/10857 + rm -rf /var/lib/cni + req_env_vars ROOTLESS_USER msg "Re-executing runner through ssh as user '$ROOTLESS_USER'" msg "************************************************************" |