From 5b4af0584d1c66b4f8d3d721374541fb76b5b395 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 22 Apr 2022 13:38:41 +0200 Subject: replace golint with revive linter golint, scopelint and interfacer are deprecated. golint is replaced by revive. This linter is better because it will also check for our error style: `error strings should not be capitalized or end with punctuation or a newline` scopelint is replaced by exportloopref (already endabled) interfacer has no replacement but I do not think this linter is important. Signed-off-by: Paul Holzinger --- test/e2e/common_test.go | 10 +++++----- test/e2e/config_amd64.go | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'test/e2e') diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index f808eb2b6..5e0c6e837 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -35,12 +35,12 @@ import ( var ( //lint:ignore ST1003 - PODMAN_BINARY string //nolint:golint,stylecheck - INTEGRATION_ROOT string //nolint:golint,stylecheck - CGROUP_MANAGER = "systemd" //nolint:golint,stylecheck - RESTORE_IMAGES = []string{ALPINE, BB, nginx} //nolint:golint,stylecheck + PODMAN_BINARY string //nolint:revive,stylecheck + INTEGRATION_ROOT string //nolint:revive,stylecheck + CGROUP_MANAGER = "systemd" //nolint:revive,stylecheck + RESTORE_IMAGES = []string{ALPINE, BB, nginx} //nolint:revive,stylecheck defaultWaitTimeout = 90 - CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:golint,stylecheck + CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() //nolint:revive,stylecheck ) // PodmanTestIntegration struct for command line options diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go index 9293fdd44..c4cb97b2e 100644 --- a/test/e2e/config_amd64.go +++ b/test/e2e/config_amd64.go @@ -1,16 +1,16 @@ package integration var ( - STORAGE_FS = "vfs" //nolint:golint,stylecheck - STORAGE_OPTIONS = "--storage-driver vfs" //nolint:golint,stylecheck - ROOTLESS_STORAGE_FS = "vfs" //nolint:golint,stylecheck - ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs" //nolint:golint,stylecheck - CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck, UBI_INIT, UBI_MINIMAL, fedoraToolbox} //nolint:golint,stylecheck + STORAGE_FS = "vfs" //nolint:revive,stylecheck + STORAGE_OPTIONS = "--storage-driver vfs" //nolint:revive,stylecheck + ROOTLESS_STORAGE_FS = "vfs" //nolint:revive,stylecheck + ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs" //nolint:revive,stylecheck + CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra, labels, healthcheck, UBI_INIT, UBI_MINIMAL, fedoraToolbox} //nolint:revive,stylecheck nginx = "quay.io/libpod/alpine_nginx:latest" - BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:golint,stylecheck + BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck registry = "quay.io/libpod/registry:2.6" labels = "quay.io/libpod/alpine_labels:latest" - UBI_MINIMAL = "registry.access.redhat.com/ubi8-minimal" //nolint:golint,stylecheck - UBI_INIT = "registry.access.redhat.com/ubi8-init" //nolint:golint,stylecheck + UBI_MINIMAL = "registry.access.redhat.com/ubi8-minimal" //nolint:revive,stylecheck + UBI_INIT = "registry.access.redhat.com/ubi8-init" //nolint:revive,stylecheck cirros = "quay.io/libpod/cirros:latest" ) -- cgit v1.2.3-54-g00ecf