diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-28 13:03:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 13:03:51 -0700 |
| commit | 9926a299f72474e456ed3f0bb51d19613e195c8d (patch) | |
| tree | 1dcc47d32093242f0798d0c9788e92ec8ed10103 /contrib/cirrus/setup_environment.sh | |
| parent | bdf9e568134c37f02f662080cfe32f7ca98710c9 (diff) | |
| parent | e06f17f58030a925c7d175dfccd09b2b3cff55e2 (diff) | |
| download | podman-9926a299f72474e456ed3f0bb51d19613e195c8d.tar.gz podman-9926a299f72474e456ed3f0bb51d19613e195c8d.tar.bz2 podman-9926a299f72474e456ed3f0bb51d19613e195c8d.zip | |
Merge pull request #3892 from cevich/google_vpc
Cirrus: Block CNI use of google VPCs
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 416a96c4e..463647d2f 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -61,8 +61,7 @@ esac # Reload to incorporate any changes from above source "$SCRIPT_BASE/lib.sh" -install_test_configs - +# Must execute before possible setup_rootless() make install.tools case "$SPECIALMODE" in @@ -97,3 +96,5 @@ case "$SPECIALMODE" in *) die 111 "Unsupported \$SPECIALMODE: $SPECIALMODE" esac + +install_test_configs |