diff --git a/.golangci.yml b/.golangci.yml index be4a254466..95f5fd22ee 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -46,7 +46,6 @@ linters: - rowserrcheck - sqlclosecheck - staticcheck - - stylecheck - testableexamples - unconvert - unparam diff --git a/cmd/podman-wslkerninst/main.go b/cmd/podman-wslkerninst/main.go index 6f34b2bbf0..76154b8cbd 100644 --- a/cmd/podman-wslkerninst/main.go +++ b/cmd/podman-wslkerninst/main.go @@ -16,12 +16,9 @@ import ( ) const ( - //nolint:stylecheck MB_ICONWARNING = 0x00000030 - //nolint:stylecheck - MB_OK = 0x00000000 - //nolint:stylecheck - MB_DEFBUTTON1 = 0x00000000 + MB_OK = 0x00000000 + MB_DEFBUTTON1 = 0x00000000 ) const KernelWarning = "WSL Kernel installation did not complete successfully. " + diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go index 9869d78f8c..ef2b7a754a 100644 --- a/cmd/podman/containers/stats.go +++ b/cmd/podman/containers/stats.go @@ -252,10 +252,10 @@ func combineBytesValues(a, b uint64) string { func outputJSON(stats []containerStats) error { type jstat struct { - Id string `json:"id"` //nolint:revive,stylecheck + Id string `json:"id"` //nolint:revive Name string `json:"name"` CPUTime string `json:"cpu_time"` - CpuPercent string `json:"cpu_percent"` //nolint:revive,stylecheck + CpuPercent string `json:"cpu_percent"` //nolint:revive AverageCPU string `json:"avg_cpu"` MemUsage string `json:"mem_usage"` MemPerc string `json:"mem_percent"` diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index 1f931d3828..123bc75a41 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -221,7 +221,7 @@ func (l ListPodReporter) ID() string { } // Id returns the Pod id -func (l ListPodReporter) Id() string { //nolint:revive,stylecheck +func (l ListPodReporter) Id() string { //nolint:revive if noTrunc { return l.ListPodsReport.Id } @@ -235,7 +235,7 @@ func (l ListPodReporter) InfraID() string { // InfraId returns the infra container id for the pod // depending on trunc -func (l ListPodReporter) InfraId() string { //nolint:revive,stylecheck +func (l ListPodReporter) InfraId() string { //nolint:revive if len(l.ListPodsReport.InfraId) == 0 { return "" } diff --git a/cmd/rootlessport/wsl_test.go b/cmd/rootlessport/wsl_test.go index ac23e22c50..f7730234c4 100644 --- a/cmd/rootlessport/wsl_test.go +++ b/cmd/rootlessport/wsl_test.go @@ -20,7 +20,7 @@ type SpecData struct { } func TestDualStackSplit(t *testing.T) { - //nolint:revive,stylecheck + //nolint:revive const ( IP4_ALL = "0.0.0.0" IP4__LO = "127.0.0.1" diff --git a/cmd/winpath/main.go b/cmd/winpath/main.go index f868999fdd..cc9f67f730 100644 --- a/cmd/winpath/main.go +++ b/cmd/winpath/main.go @@ -18,15 +18,10 @@ import ( type operation int const ( - //nolint:stylecheck - HWND_BROADCAST = 0xFFFF - //nolint:stylecheck + HWND_BROADCAST = 0xFFFF WM_SETTINGCHANGE = 0x001A - //nolint:stylecheck SMTO_ABORTIFHUNG = 0x0002 - //nolint:stylecheck - ERR_BAD_ARGS = 0x000A - //nolint:stylecheck + ERR_BAD_ARGS = 0x000A OPERATION_FAILED = 0x06AC Environment = "Environment" diff --git a/libpod/container_exec.go b/libpod/container_exec.go index 98542efa53..d57a2c044f 100644 --- a/libpod/container_exec.go +++ b/libpod/container_exec.go @@ -86,12 +86,10 @@ type ExecConfig struct { type ExecSession struct { // Id is the ID of the exec session. // Named somewhat strangely to not conflict with ID(). - //nolint:stylecheck,revive - Id string `json:"id"` + Id string `json:"id"` //nolint:revive // ContainerId is the ID of the container this exec session belongs to. // Named somewhat strangely to not conflict with ContainerID(). - //nolint:stylecheck,revive - ContainerId string `json:"containerId"` + ContainerId string `json:"containerId"` //nolint:revive // State is the state of the exec session. State define.ContainerExecStatus `json:"state"` diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 6859b48e1f..fa9b1320a5 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -357,7 +357,7 @@ type HealthCheckLog struct { // Some things cannot be inferred. These will be populated by spec annotations // (if available). // -//nolint:revive,stylecheck // Field names are fixed for compatibility and cannot be changed. +//nolint:revive // Field names are fixed for compatibility and cannot be changed. type InspectContainerHostConfig struct { // Binds contains an array of user-added mounts. // Both volume mounts and named volumes are included. diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go index 03be953ce7..efa55094c0 100644 --- a/pkg/api/handlers/compat/images.go +++ b/pkg/api/handlers/compat/images.go @@ -243,7 +243,7 @@ func CreateImageFromSrc(w http.ResponseWriter, r *http.Request) { Status string `json:"status"` Progress string `json:"progress"` ProgressDetail map[string]string `json:"progressDetail"` - Id string `json:"id"` //nolint:revive,stylecheck + Id string `json:"id"` //nolint:revive }{ Status: report.Id, ProgressDetail: map[string]string{}, diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index b97a757669..a09523aa86 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -110,11 +110,11 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { Compression uint64 `schema:"compression"` ConfigureNetwork string `schema:"networkmode"` CPPFlags string `schema:"cppflags"` - CpuPeriod uint64 `schema:"cpuperiod"` //nolint:revive,stylecheck - CpuQuota int64 `schema:"cpuquota"` //nolint:revive,stylecheck - CpuSetCpus string `schema:"cpusetcpus"` //nolint:revive,stylecheck - CpuSetMems string `schema:"cpusetmems"` //nolint:revive,stylecheck - CpuShares uint64 `schema:"cpushares"` //nolint:revive,stylecheck + CpuPeriod uint64 `schema:"cpuperiod"` //nolint:revive + CpuQuota int64 `schema:"cpuquota"` //nolint:revive + CpuSetCpus string `schema:"cpusetcpus"` //nolint:revive + CpuSetMems string `schema:"cpusetmems"` //nolint:revive + CpuShares uint64 `schema:"cpushares"` //nolint:revive DNSOptions string `schema:"dnsoptions"` DNSSearch string `schema:"dnssearch"` DNSServers string `schema:"dnsservers"` diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index 9544d170d0..6ce6d9d52a 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -50,7 +50,7 @@ var ( shortName: "busybox", tarballName: "busybox.tar", } - CACHE_IMAGES = []testImage{alpine, busybox} //nolint:revive,stylecheck + CACHE_IMAGES = []testImage{alpine, busybox} //nolint:revive ) type bindingTest struct { diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index 105b091549..7839388f51 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -89,7 +89,7 @@ type PauseUnPauseOptions struct { type PauseUnpauseReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string } @@ -103,7 +103,7 @@ type StopOptions struct { type StopReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string } @@ -125,7 +125,7 @@ type KillOptions struct { type KillReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string } @@ -139,7 +139,7 @@ type RestartOptions struct { type RestartReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string } @@ -187,7 +187,7 @@ type CopyOptions struct { } type CommitReport struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type ContainerExportOptions struct { @@ -235,7 +235,7 @@ type RestoreOptions struct { type RestoreReport = types.RestoreReport type ContainerCreateReport struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive } // AttachOptions describes the cli and other values @@ -315,7 +315,7 @@ type ContainerStartOptions struct { // ContainerStartReport describes the response from starting // containers from the cli type ContainerStartReport struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string Err error ExitCode int @@ -360,7 +360,7 @@ type ContainerRunOptions struct { // a container type ContainerRunReport struct { ExitCode int - Id string //nolint:revive,stylecheck + Id string //nolint:revive } // ContainerCleanupOptions are the CLI values for the @@ -378,7 +378,7 @@ type ContainerCleanupOptions struct { // container cleanup type ContainerCleanupReport struct { CleanErr error - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string RmErr error RmiErr error @@ -395,7 +395,7 @@ type ContainerInitOptions struct { // container init type ContainerInitReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string } @@ -418,7 +418,7 @@ type ContainerUnmountOptions struct { // ContainerMountReport describes the response from container mount type ContainerMountReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive Name string Path string } @@ -426,7 +426,7 @@ type ContainerMountReport struct { // ContainerUnmountReport describes the response from umounting a container type ContainerUnmountReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } // ContainerPruneOptions describes the options needed @@ -445,7 +445,7 @@ type ContainerPortOptions struct { // ContainerPortReport describes the output needed for // the CLI to output ports type ContainerPortReport struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive Ports []nettypes.PortMapping } diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 063a43b77d..c3f6aba8ae 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -47,7 +47,7 @@ type Image struct { HealthCheck *manifest.Schema2HealthConfig `json:",omitempty"` } -func (i *Image) Id() string { //nolint:revive,stylecheck +func (i *Image) Id() string { //nolint:revive return i.ID } diff --git a/pkg/domain/entities/reports/containers.go b/pkg/domain/entities/reports/containers.go index 6ccbc9a623..d209efdac9 100644 --- a/pkg/domain/entities/reports/containers.go +++ b/pkg/domain/entities/reports/containers.go @@ -1,7 +1,7 @@ package reports type RmReport struct { - Id string `json:"Id"` //nolint:revive,stylecheck + Id string `json:"Id"` //nolint:revive Err error `json:"Err,omitempty"` RawInput string `json:"-"` } diff --git a/pkg/domain/entities/reports/prune.go b/pkg/domain/entities/reports/prune.go index ac3d8e7ced..cf93fcbc4d 100644 --- a/pkg/domain/entities/reports/prune.go +++ b/pkg/domain/entities/reports/prune.go @@ -1,7 +1,7 @@ package reports type PruneReport struct { - Id string `json:"Id"` //nolint:revive,stylecheck + Id string `json:"Id"` //nolint:revive Err error `json:"Err,omitempty"` Size uint64 `json:"Size"` } diff --git a/pkg/domain/entities/reports/scp.go b/pkg/domain/entities/reports/scp.go index 1e102bab3d..15b2b83f36 100644 --- a/pkg/domain/entities/reports/scp.go +++ b/pkg/domain/entities/reports/scp.go @@ -1,5 +1,5 @@ package reports type ScpReport struct { - Id string `json:"Id"` //nolint:revive,stylecheck + Id string `json:"Id"` //nolint:revive } diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index 256ad15eb8..65eafa969d 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -20,7 +20,7 @@ type Volume struct { } type Report struct { - Id []string //nolint:revive,stylecheck + Id []string //nolint:revive Err map[string]error } diff --git a/pkg/domain/entities/types/containers.go b/pkg/domain/entities/types/containers.go index a02a700cde..5ddb9fffb8 100644 --- a/pkg/domain/entities/types/containers.go +++ b/pkg/domain/entities/types/containers.go @@ -14,7 +14,7 @@ type ContainerStatReport struct { type CheckpointReport struct { Err error `json:"-"` - Id string `json:"Id"` //nolint:revive,stylecheck + Id string `json:"Id"` //nolint:revive RawInput string `json:"-"` RuntimeDuration int64 `json:"runtime_checkpoint_duration"` CRIUStatistics *define.CRIUCheckpointRestoreStatistics `json:"criu_statistics"` @@ -22,7 +22,7 @@ type CheckpointReport struct { type RestoreReport struct { Err error `json:"-"` - Id string `json:"Id"` //nolint:revive,stylecheck + Id string `json:"Id"` //nolint:revive RawInput string `json:"-"` RuntimeDuration int64 `json:"runtime_restore_duration"` CRIUStatistics *define.CRIUCheckpointRestoreStatistics `json:"criu_statistics"` diff --git a/pkg/domain/entities/types/images.go b/pkg/domain/entities/types/images.go index 48344cfa9f..6c5075427f 100644 --- a/pkg/domain/entities/types/images.go +++ b/pkg/domain/entities/types/images.go @@ -10,7 +10,7 @@ import ( // swagger:model LibpodImageSummary type ImageSummary struct { ID string `json:"Id"` - ParentId string //nolint:revive,stylecheck + ParentId string //nolint:revive RepoTags []string RepoDigests []string Created int64 @@ -34,7 +34,7 @@ type ImageSummary struct { Os string `json:",omitempty"` } -func (i *ImageSummary) Id() string { //nolint:revive,stylecheck +func (i *ImageSummary) Id() string { //nolint:revive return i.ID } @@ -59,7 +59,7 @@ type ImageLoadReport struct { } type ImageImportReport struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive } // ImageSearchReport is the response from searching images. @@ -90,7 +90,7 @@ type ShowTrustReport struct { // ImageMountReport describes the response from image mount type ImageMountReport struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive Name string Repositories []string Path string @@ -99,7 +99,7 @@ type ImageMountReport struct { // ImageUnmountReport describes the response from umounting an image type ImageUnmountReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } // FarmInspectReport describes the response from farm inspect diff --git a/pkg/domain/entities/types/network.go b/pkg/domain/entities/types/network.go index ae233b8232..1fc212bd94 100644 --- a/pkg/domain/entities/types/network.go +++ b/pkg/domain/entities/types/network.go @@ -14,8 +14,7 @@ type NetworkPruneReport struct { // NetworkReloadReport describes the results of reloading a container network. type NetworkReloadReport struct { - //nolint:stylecheck,revive - Id string + Id string //nolint:revive Err error } diff --git a/pkg/domain/entities/types/pods.go b/pkg/domain/entities/types/pods.go index eaaef1501b..446d34d4de 100644 --- a/pkg/domain/entities/types/pods.go +++ b/pkg/domain/entities/types/pods.go @@ -9,47 +9,47 @@ import ( type PodPruneReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type PodPauseReport struct { Errs []error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type PodUnpauseReport struct { Errs []error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type PodStopReport struct { Errs []error - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string } type PodRestartReport struct { Errs []error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type PodStartReport struct { Errs []error - Id string //nolint:revive,stylecheck + Id string //nolint:revive RawInput string } type PodRmReport struct { RemovedCtrs map[string]error Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type PodCreateReport struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type PodCloneReport struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive } // PodStatsReport includes pod-resource statistics data. @@ -95,15 +95,15 @@ type PodInspectReport struct { type PodKillReport struct { Errs []error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type ListPodsReport struct { Cgroup string Containers []*ListPodContainer Created time.Time - Id string //nolint:revive,stylecheck - InfraId string //nolint:revive,stylecheck + Id string //nolint:revive + InfraId string //nolint:revive Name string Namespace string // Network names connected to infra container @@ -113,7 +113,7 @@ type ListPodsReport struct { } type ListPodContainer struct { - Id string //nolint:revive,stylecheck + Id string //nolint:revive Names string Status string RestartCount uint diff --git a/pkg/domain/entities/types/volumes.go b/pkg/domain/entities/types/volumes.go index 3a47d9d7b7..5f41d72038 100644 --- a/pkg/domain/entities/types/volumes.go +++ b/pkg/domain/entities/types/volumes.go @@ -22,7 +22,7 @@ type VolumeCreateOptions struct { type VolumeRmReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type VolumeInspectReport struct { *VolumeConfigResponse @@ -38,14 +38,14 @@ type VolumeReloadReport struct { type VolumeMountReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive Name string Path string } type VolumeUnmountReport struct { Err error - Id string //nolint:revive,stylecheck + Id string //nolint:revive } type VolumeConfigResponse struct { diff --git a/pkg/errorhandling/errorhandling.go b/pkg/errorhandling/errorhandling.go index da39b04668..203cf89044 100644 --- a/pkg/errorhandling/errorhandling.go +++ b/pkg/errorhandling/errorhandling.go @@ -86,7 +86,7 @@ func Contains(err error, sub error) bool { // PodConflictErrorModel is used in remote connections with podman type PodConflictErrorModel struct { Errs []string - Id string //nolint:revive,stylecheck + Id string //nolint:revive } // ErrorModel is used in remote connections with podman diff --git a/pkg/k8s.io/api/core/v1/resource.go b/pkg/k8s.io/api/core/v1/resource.go index d2dba9f9b4..7c9b6bd0e9 100644 --- a/pkg/k8s.io/api/core/v1/resource.go +++ b/pkg/k8s.io/api/core/v1/resource.go @@ -27,7 +27,7 @@ func (rn ResourceName) String() string { // Cpu returns the Cpu limit if specified. // -//nolint:revive,stylecheck +//nolint:revive func (rl *ResourceList) Cpu() *resource.Quantity { return rl.Name(ResourceCPU, resource.DecimalSI) } diff --git a/pkg/machine/machine_windows.go b/pkg/machine/machine_windows.go index dd59876ad3..4a9fde2783 100644 --- a/pkg/machine/machine_windows.go +++ b/pkg/machine/machine_windows.go @@ -36,7 +36,6 @@ const ( GlobalNameWait = 250 * time.Millisecond ) -//nolint:stylecheck const WM_QUIT = 0x12 type WinProxyOpts struct { diff --git a/pkg/machine/wsl/util_windows.go b/pkg/machine/wsl/util_windows.go index d50f73b915..6f9ce4e1bc 100644 --- a/pkg/machine/wsl/util_windows.go +++ b/pkg/machine/wsl/util_windows.go @@ -59,10 +59,8 @@ type TokenPrivileges struct { // Cleaner to refer to the official OS constant names, and consistent with syscall // Ref: https://learn.microsoft.com/en-us/windows/win32/api/shellapi/ns-shellapi-shellexecuteinfow#members const ( - //nolint:stylecheck SEE_MASK_NOCLOSEPROCESS = 0x40 - //nolint:stylecheck - SE_ERR_ACCESSDENIED = 0x05 + SE_ERR_ACCESSDENIED = 0x05 ) const ( diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index 17b0047ada..a33edf494c 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -139,9 +139,9 @@ const ( KeyPull = "Pull" KeyReadOnly = "ReadOnly" KeyReadOnlyTmpfs = "ReadOnlyTmpfs" - KeyRemapGid = "RemapGid" //nolint:stylecheck // deprecated - KeyRemapUid = "RemapUid" //nolint:stylecheck // deprecated - KeyRemapUidSize = "RemapUidSize" //nolint:stylecheck // deprecated + KeyRemapGid = "RemapGid" // deprecated + KeyRemapUid = "RemapUid" // deprecated + KeyRemapUidSize = "RemapUidSize" // deprecated KeyRemapUsers = "RemapUsers" // deprecated KeyRetry = "Retry" KeyRetryDelay = "RetryDelay" diff --git a/test/e2e/artifact_test.go b/test/e2e/artifact_test.go index e5b34d64b3..5cec15624e 100644 --- a/test/e2e/artifact_test.go +++ b/test/e2e/artifact_test.go @@ -14,13 +14,13 @@ import ( ) const ( - //nolint:revive,stylecheck + //nolint:revive ARTIFACT_SINGLE = "quay.io/libpod/testartifact:20250206-single" - //nolint:revive,stylecheck + //nolint:revive ARTIFACT_MULTI = "quay.io/libpod/testartifact:20250206-multi" - //nolint:revive,stylecheck + //nolint:revive ARTIFACT_MULTI_NO_TITLE = "quay.io/libpod/testartifact:20250206-multi-no-title" - //nolint:revive,stylecheck + //nolint:revive ARTIFACT_EVIL = "quay.io/libpod/testartifact:20250206-evil" ) diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index f446a2bd35..d4f2eb82d3 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -44,10 +44,10 @@ import ( var ( //lint:ignore ST1003 - PODMAN_BINARY string //nolint:revive,stylecheck - INTEGRATION_ROOT string //nolint:revive,stylecheck - CGROUP_MANAGER = "systemd" //nolint:revive,stylecheck - RESTORE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE} //nolint:revive,stylecheck + PODMAN_BINARY string //nolint:revive + INTEGRATION_ROOT string //nolint:revive + CGROUP_MANAGER = "systemd" //nolint:revive + RESTORE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE} //nolint:revive defaultWaitTimeout = 90 CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() ) diff --git a/test/e2e/config.go b/test/e2e/config.go index af9364502d..81c362ce90 100644 --- a/test/e2e/config.go +++ b/test/e2e/config.go @@ -3,7 +3,7 @@ package integration var ( - REDIS_IMAGE = "quay.io/libpod/redis:alpine" //nolint:revive,stylecheck + REDIS_IMAGE = "quay.io/libpod/redis:alpine" //nolint:revive fedoraMinimal = "quay.io/libpod/systemd-image:20240124" ALPINE = "quay.io/libpod/alpine:latest" ALPINELISTTAG = "quay.io/libpod/alpine:3.10.2" @@ -12,9 +12,9 @@ var ( ALPINEAMD64ID = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4" ALPINEARM64DIGEST = "quay.io/libpod/alpine@sha256:f270dcd11e64b85919c3bab66886e59d677cf657528ac0e4805d3c71e458e525" ALPINEARM64ID = "915beeae46751fc564998c79e73a1026542e945ca4f73dc841d09ccc6c2c0672" - INFRA_IMAGE = "quay.io/libpod/k8s-pause:3.5" //nolint:revive,stylecheck + INFRA_IMAGE = "quay.io/libpod/k8s-pause:3.5" //nolint:revive BB = "quay.io/libpod/busybox:latest" - HEALTHCHECK_IMAGE = "quay.io/libpod/alpine_healthcheck:latest" //nolint:revive,stylecheck + HEALTHCHECK_IMAGE = "quay.io/libpod/alpine_healthcheck:latest" //nolint:revive volumeTest = "quay.io/libpod/volume-plugin-test-img:20220623" // ImageCacheDir is initialized at runtime. diff --git a/test/e2e/config_amd64.go b/test/e2e/config_amd64.go index 49da96b3d0..dea90c1740 100644 --- a/test/e2e/config_amd64.go +++ b/test/e2e/config_amd64.go @@ -3,14 +3,14 @@ package integration var ( - STORAGE_FS = "overlay" //nolint:revive,stylecheck - STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive,stylecheck - ROOTLESS_STORAGE_FS = "overlay" //nolint:revive,stylecheck - CACHE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, CITEST_IMAGE, HEALTHCHECK_IMAGE, SYSTEMD_IMAGE} //nolint:revive,stylecheck - NGINX_IMAGE = "quay.io/libpod/alpine_nginx:latest" //nolint:revive,stylecheck - BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck - REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive,stylecheck - CITEST_IMAGE = "quay.io/libpod/testimage:20241011" //nolint:revive,stylecheck - SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive,stylecheck - CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive,stylecheck + STORAGE_FS = "overlay" //nolint:revive + STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive + ROOTLESS_STORAGE_FS = "overlay" //nolint:revive + CACHE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, CITEST_IMAGE, HEALTHCHECK_IMAGE, SYSTEMD_IMAGE} //nolint:revive + NGINX_IMAGE = "quay.io/libpod/alpine_nginx:latest" //nolint:revive + BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive + REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive + CITEST_IMAGE = "quay.io/libpod/testimage:20241011" //nolint:revive + SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive + CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive ) diff --git a/test/e2e/config_arm64.go b/test/e2e/config_arm64.go index fcfb496b0f..32d2a3476d 100644 --- a/test/e2e/config_arm64.go +++ b/test/e2e/config_arm64.go @@ -3,14 +3,14 @@ package integration var ( - STORAGE_FS = "overlay" //nolint:revive,stylecheck - STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive,stylecheck - ROOTLESS_STORAGE_FS = "overlay" //nolint:revive,stylecheck - CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, CITEST_IMAGE, HEALTHCHECK_IMAGE, SYSTEMD_IMAGE} //nolint:revive,stylecheck - NGINX_IMAGE = "quay.io/lsm5/alpine_nginx-aarch64:latest" //nolint:revive,stylecheck - BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck - REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive,stylecheck - CITEST_IMAGE = "quay.io/libpod/testimage:20241011" //nolint:revive,stylecheck - SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive,stylecheck - CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive,stylecheck + STORAGE_FS = "overlay" //nolint:revive + STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive + ROOTLESS_STORAGE_FS = "overlay" //nolint:revive + CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, CITEST_IMAGE, HEALTHCHECK_IMAGE, SYSTEMD_IMAGE} //nolint:revive + NGINX_IMAGE = "quay.io/lsm5/alpine_nginx-aarch64:latest" //nolint:revive + BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive + REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive + CITEST_IMAGE = "quay.io/libpod/testimage:20241011" //nolint:revive + SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive + CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive ) diff --git a/test/utils/utils.go b/test/utils/utils.go index 2bb3f22d31..e6e3f0706a 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -20,9 +20,9 @@ import ( "github.com/sirupsen/logrus" - . "github.com/onsi/ginkgo/v2" //nolint:revive,stylecheck - . "github.com/onsi/gomega" //nolint:revive,stylecheck - . "github.com/onsi/gomega/gexec" //nolint:revive,stylecheck + . "github.com/onsi/ginkgo/v2" //nolint:revive + . "github.com/onsi/gomega" //nolint:revive + . "github.com/onsi/gomega/gexec" //nolint:revive ) type NetworkBackend int