diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-08 02:02:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 02:02:30 -0700 |
| commit | d86729e743fb5a58b9364ee5e991b5db2e9dd600 (patch) | |
| tree | 8ae6789a7e7e5e52de2270bb3854f01dc55b9949 /test/e2e | |
| parent | bc320be00bc584bd88525266d23a9d5edb9d44f8 (diff) | |
| parent | 23602de816b9ee3e92a8cbac295e955ba43fa283 (diff) | |
| download | podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.tar.gz podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.tar.bz2 podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.zip | |
Merge pull request #2865 from baude/pr/2864
Revert "Switch to golangci-lint"
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/common_test.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 0b3db32f4..b20b3b37e 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -22,14 +22,15 @@ import ( ) var ( - PODMAN_BINARY string - CONMON_BINARY string - CNI_CONFIG_DIR string - RUNC_BINARY string - INTEGRATION_ROOT string - CGROUP_MANAGER = "systemd" - ARTIFACT_DIR = "/tmp/.artifacts" - RESTORE_IMAGES = []string{ALPINE, BB} + PODMAN_BINARY string + CONMON_BINARY string + CNI_CONFIG_DIR string + RUNC_BINARY string + INTEGRATION_ROOT string + CGROUP_MANAGER = "systemd" + ARTIFACT_DIR = "/tmp/.artifacts" + RESTORE_IMAGES = []string{ALPINE, BB} + defaultWaitTimeout = 90 ) // PodmanTestIntegration struct for command line options |