opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-24 15:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: remove stylecheck linter

Browse Source 
It is to be merged into staticcheck linter in golangci-lint v2.0.0.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2025-03-27 16:06:57 -07:00
parent 5aa035c69c
commit f4f2580b0d
33 changed files with 101 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@ -46,7 +46,6 @@ linters:
- rowserrcheck - rowserrcheck
- sqlclosecheck - sqlclosecheck
- staticcheck - staticcheck
- stylecheck
- testableexamples - testableexamples
- unconvert - unconvert
- unparam - unparam

3
cmd/podman-wslkerninst/main.go
View File

@ -16,11 +16,8 @@ import (
) )
const ( const (
//nolint:stylecheck
MB_ICONWARNING = 0x00000030 MB_ICONWARNING = 0x00000030
//nolint:stylecheck
MB_OK = 0x00000000 MB_OK = 0x00000000
//nolint:stylecheck
MB_DEFBUTTON1 = 0x00000000 MB_DEFBUTTON1 = 0x00000000
) )

4
cmd/podman/containers/stats.go
View File

@ -252,10 +252,10 @@ func combineBytesValues(a, b uint64) string {
func outputJSON(stats []containerStats) error { func outputJSON(stats []containerStats) error {
type jstat struct { type jstat struct {
Id string `json:"id"` //nolint:revive,stylecheck Id string `json:"id"` //nolint:revive
Name string `json:"name"` Name string `json:"name"`
CPUTime string `json:"cpu_time"` 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"` AverageCPU string `json:"avg_cpu"`
MemUsage string `json:"mem_usage"` MemUsage string `json:"mem_usage"`
MemPerc string `json:"mem_percent"` MemPerc string `json:"mem_percent"`

4
cmd/podman/pods/ps.go
View File

@ -221,7 +221,7 @@ func (l ListPodReporter) ID() string {
} }
// Id returns the Pod id // Id returns the Pod id
func (l ListPodReporter) Id() string { //nolint:revive,stylecheck func (l ListPodReporter) Id() string { //nolint:revive
if noTrunc { if noTrunc {
return l.ListPodsReport.Id return l.ListPodsReport.Id
} }
@ -235,7 +235,7 @@ func (l ListPodReporter) InfraID() string {
// InfraId returns the infra container id for the pod // InfraId returns the infra container id for the pod
// depending on trunc // depending on trunc
func (l ListPodReporter) InfraId() string { //nolint:revive,stylecheck func (l ListPodReporter) InfraId() string { //nolint:revive
if len(l.ListPodsReport.InfraId) == 0 { if len(l.ListPodsReport.InfraId) == 0 {
return "" return ""
} }

2
cmd/rootlessport/wsl_test.go
View File

@ -20,7 +20,7 @@ type SpecData struct {
} }
func TestDualStackSplit(t *testing.T) { func TestDualStackSplit(t *testing.T) {
//nolint:revive,stylecheck //nolint:revive
const ( const (
IP4_ALL = "0.0.0.0" IP4_ALL = "0.0.0.0"
IP4__LO = "127.0.0.1" IP4__LO = "127.0.0.1"

5
cmd/winpath/main.go
View File

@ -18,15 +18,10 @@ import (
type operation int type operation int
const ( const (
//nolint:stylecheck
HWND_BROADCAST = 0xFFFF HWND_BROADCAST = 0xFFFF
//nolint:stylecheck
WM_SETTINGCHANGE = 0x001A WM_SETTINGCHANGE = 0x001A
//nolint:stylecheck
SMTO_ABORTIFHUNG = 0x0002 SMTO_ABORTIFHUNG = 0x0002
//nolint:stylecheck
ERR_BAD_ARGS = 0x000A ERR_BAD_ARGS = 0x000A
//nolint:stylecheck
OPERATION_FAILED = 0x06AC OPERATION_FAILED = 0x06AC
Environment = "Environment" Environment = "Environment"

6
libpod/container_exec.go
View File

@ -86,12 +86,10 @@ type ExecConfig struct {
type ExecSession struct { type ExecSession struct {
// Id is the ID of the exec session. // Id is the ID of the exec session.
// Named somewhat strangely to not conflict with ID(). // Named somewhat strangely to not conflict with ID().
//nolint:stylecheck,revive Id string `json:"id"` //nolint:revive
Id string `json:"id"`
// ContainerId is the ID of the container this exec session belongs to. // ContainerId is the ID of the container this exec session belongs to.
// Named somewhat strangely to not conflict with ContainerID(). // Named somewhat strangely to not conflict with ContainerID().
//nolint:stylecheck,revive ContainerId string `json:"containerId"` //nolint:revive
ContainerId string `json:"containerId"`
// State is the state of the exec session. // State is the state of the exec session.
State define.ContainerExecStatus `json:"state"` State define.ContainerExecStatus `json:"state"`

2
libpod/define/container_inspect.go
View File

@ -357,7 +357,7 @@ type HealthCheckLog struct {
// Some things cannot be inferred. These will be populated by spec annotations // Some things cannot be inferred. These will be populated by spec annotations
// (if available). // (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 { type InspectContainerHostConfig struct {
// Binds contains an array of user-added mounts. // Binds contains an array of user-added mounts.
// Both volume mounts and named volumes are included. // Both volume mounts and named volumes are included.

2
pkg/api/handlers/compat/images.go
View File

@ -243,7 +243,7 @@ func CreateImageFromSrc(w http.ResponseWriter, r *http.Request) {
Status string `json:"status"` Status string `json:"status"`
Progress string `json:"progress"` Progress string `json:"progress"`
ProgressDetail map[string]string `json:"progressDetail"` ProgressDetail map[string]string `json:"progressDetail"`
Id string `json:"id"` //nolint:revive,stylecheck Id string `json:"id"` //nolint:revive
}{ }{
Status: report.Id, Status: report.Id,
ProgressDetail: map[string]string{}, ProgressDetail: map[string]string{},

10
pkg/api/handlers/compat/images_build.go
View File

@ -110,11 +110,11 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
Compression uint64 `schema:"compression"` Compression uint64 `schema:"compression"`
ConfigureNetwork string `schema:"networkmode"` ConfigureNetwork string `schema:"networkmode"`
CPPFlags string `schema:"cppflags"` CPPFlags string `schema:"cppflags"`
CpuPeriod uint64 `schema:"cpuperiod"` //nolint:revive,stylecheck CpuPeriod uint64 `schema:"cpuperiod"` //nolint:revive
CpuQuota int64 `schema:"cpuquota"` //nolint:revive,stylecheck CpuQuota int64 `schema:"cpuquota"` //nolint:revive
CpuSetCpus string `schema:"cpusetcpus"` //nolint:revive,stylecheck CpuSetCpus string `schema:"cpusetcpus"` //nolint:revive
CpuSetMems string `schema:"cpusetmems"` //nolint:revive,stylecheck CpuSetMems string `schema:"cpusetmems"` //nolint:revive
CpuShares uint64 `schema:"cpushares"` //nolint:revive,stylecheck CpuShares uint64 `schema:"cpushares"` //nolint:revive
DNSOptions string `schema:"dnsoptions"` DNSOptions string `schema:"dnsoptions"`
DNSSearch string `schema:"dnssearch"` DNSSearch string `schema:"dnssearch"`
DNSServers string `schema:"dnsservers"` DNSServers string `schema:"dnsservers"`

2
pkg/bindings/test/common_test.go
View File

@ -50,7 +50,7 @@ var (
shortName: "busybox", shortName: "busybox",
tarballName: "busybox.tar", tarballName: "busybox.tar",
} }
CACHE_IMAGES = []testImage{alpine, busybox} //nolint:revive,stylecheck CACHE_IMAGES = []testImage{alpine, busybox} //nolint:revive
) )
type bindingTest struct { type bindingTest struct {

26
pkg/domain/entities/containers.go
View File

@ -89,7 +89,7 @@ type PauseUnPauseOptions struct {
type PauseUnpauseReport struct { type PauseUnpauseReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
} }
@ -103,7 +103,7 @@ type StopOptions struct {
type StopReport struct { type StopReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
} }
@ -125,7 +125,7 @@ type KillOptions struct {
type KillReport struct { type KillReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
} }
@ -139,7 +139,7 @@ type RestartOptions struct {
type RestartReport struct { type RestartReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
} }
@ -187,7 +187,7 @@ type CopyOptions struct {
} }
type CommitReport struct { type CommitReport struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type ContainerExportOptions struct { type ContainerExportOptions struct {
@ -235,7 +235,7 @@ type RestoreOptions struct {
type RestoreReport = types.RestoreReport type RestoreReport = types.RestoreReport
type ContainerCreateReport struct { type ContainerCreateReport struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
// AttachOptions describes the cli and other values // AttachOptions describes the cli and other values
@ -315,7 +315,7 @@ type ContainerStartOptions struct {
// ContainerStartReport describes the response from starting // ContainerStartReport describes the response from starting
// containers from the cli // containers from the cli
type ContainerStartReport struct { type ContainerStartReport struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
Err error Err error
ExitCode int ExitCode int
@ -360,7 +360,7 @@ type ContainerRunOptions struct {
// a container // a container
type ContainerRunReport struct { type ContainerRunReport struct {
ExitCode int ExitCode int
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
// ContainerCleanupOptions are the CLI values for the // ContainerCleanupOptions are the CLI values for the
@ -378,7 +378,7 @@ type ContainerCleanupOptions struct {
// container cleanup // container cleanup
type ContainerCleanupReport struct { type ContainerCleanupReport struct {
CleanErr error CleanErr error
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
RmErr error RmErr error
RmiErr error RmiErr error
@ -395,7 +395,7 @@ type ContainerInitOptions struct {
// container init // container init
type ContainerInitReport struct { type ContainerInitReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
} }
@ -418,7 +418,7 @@ type ContainerUnmountOptions struct {
// ContainerMountReport describes the response from container mount // ContainerMountReport describes the response from container mount
type ContainerMountReport struct { type ContainerMountReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
Name string Name string
Path string Path string
} }
@ -426,7 +426,7 @@ type ContainerMountReport struct {
// ContainerUnmountReport describes the response from umounting a container // ContainerUnmountReport describes the response from umounting a container
type ContainerUnmountReport struct { type ContainerUnmountReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
// ContainerPruneOptions describes the options needed // ContainerPruneOptions describes the options needed
@ -445,7 +445,7 @@ type ContainerPortOptions struct {
// ContainerPortReport describes the output needed for // ContainerPortReport describes the output needed for
// the CLI to output ports // the CLI to output ports
type ContainerPortReport struct { type ContainerPortReport struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
Ports []nettypes.PortMapping Ports []nettypes.PortMapping
} }

2
pkg/domain/entities/images.go
View File

@ -47,7 +47,7 @@ type Image struct {
HealthCheck *manifest.Schema2HealthConfig `json:",omitempty"` HealthCheck *manifest.Schema2HealthConfig `json:",omitempty"`
} }
func (i *Image) Id() string { //nolint:revive,stylecheck func (i *Image) Id() string { //nolint:revive
return i.ID return i.ID
} }

2
pkg/domain/entities/reports/containers.go
View File

@ -1,7 +1,7 @@
package reports package reports
type RmReport struct { type RmReport struct {
Id string `json:"Id"` //nolint:revive,stylecheck Id string `json:"Id"` //nolint:revive
Err error `json:"Err,omitempty"` Err error `json:"Err,omitempty"`
RawInput string `json:"-"` RawInput string `json:"-"`
} }

2
pkg/domain/entities/reports/prune.go
View File

@ -1,7 +1,7 @@
package reports package reports
type PruneReport struct { type PruneReport struct {
Id string `json:"Id"` //nolint:revive,stylecheck Id string `json:"Id"` //nolint:revive
Err error `json:"Err,omitempty"` Err error `json:"Err,omitempty"`
Size uint64 `json:"Size"` Size uint64 `json:"Size"`
} }

2
pkg/domain/entities/reports/scp.go
View File

@ -1,5 +1,5 @@
package reports package reports
type ScpReport struct { type ScpReport struct {
Id string `json:"Id"` //nolint:revive,stylecheck Id string `json:"Id"` //nolint:revive
} }

2
pkg/domain/entities/types.go
View File

@ -20,7 +20,7 @@ type Volume struct {
} }
type Report struct { type Report struct {
Id []string //nolint:revive,stylecheck Id []string //nolint:revive
Err map[string]error Err map[string]error
} }

4
pkg/domain/entities/types/containers.go
View File

@ -14,7 +14,7 @@ type ContainerStatReport struct {
type CheckpointReport struct { type CheckpointReport struct {
Err error `json:"-"` Err error `json:"-"`
Id string `json:"Id"` //nolint:revive,stylecheck Id string `json:"Id"` //nolint:revive
RawInput string `json:"-"` RawInput string `json:"-"`
RuntimeDuration int64 `json:"runtime_checkpoint_duration"` RuntimeDuration int64 `json:"runtime_checkpoint_duration"`
CRIUStatistics *define.CRIUCheckpointRestoreStatistics `json:"criu_statistics"` CRIUStatistics *define.CRIUCheckpointRestoreStatistics `json:"criu_statistics"`
@ -22,7 +22,7 @@ type CheckpointReport struct {
type RestoreReport struct { type RestoreReport struct {
Err error `json:"-"` Err error `json:"-"`
Id string `json:"Id"` //nolint:revive,stylecheck Id string `json:"Id"` //nolint:revive
RawInput string `json:"-"` RawInput string `json:"-"`
RuntimeDuration int64 `json:"runtime_restore_duration"` RuntimeDuration int64 `json:"runtime_restore_duration"`
CRIUStatistics *define.CRIUCheckpointRestoreStatistics `json:"criu_statistics"` CRIUStatistics *define.CRIUCheckpointRestoreStatistics `json:"criu_statistics"`

10
pkg/domain/entities/types/images.go
View File

@ -10,7 +10,7 @@ import (
// swagger:model LibpodImageSummary // swagger:model LibpodImageSummary
type ImageSummary struct { type ImageSummary struct {
ID string `json:"Id"` ID string `json:"Id"`
ParentId string //nolint:revive,stylecheck ParentId string //nolint:revive
RepoTags []string RepoTags []string
RepoDigests []string RepoDigests []string
Created int64 Created int64
@ -34,7 +34,7 @@ type ImageSummary struct {
Os string `json:",omitempty"` Os string `json:",omitempty"`
} }
func (i *ImageSummary) Id() string { //nolint:revive,stylecheck func (i *ImageSummary) Id() string { //nolint:revive
return i.ID return i.ID
} }
@ -59,7 +59,7 @@ type ImageLoadReport struct {
} }
type ImageImportReport struct { type ImageImportReport struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
// ImageSearchReport is the response from searching images. // ImageSearchReport is the response from searching images.
@ -90,7 +90,7 @@ type ShowTrustReport struct {
// ImageMountReport describes the response from image mount // ImageMountReport describes the response from image mount
type ImageMountReport struct { type ImageMountReport struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
Name string Name string
Repositories []string Repositories []string
Path string Path string
@ -99,7 +99,7 @@ type ImageMountReport struct {
// ImageUnmountReport describes the response from umounting an image // ImageUnmountReport describes the response from umounting an image
type ImageUnmountReport struct { type ImageUnmountReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
// FarmInspectReport describes the response from farm inspect // FarmInspectReport describes the response from farm inspect

3
pkg/domain/entities/types/network.go
View File

@ -14,8 +14,7 @@ type NetworkPruneReport struct {
// NetworkReloadReport describes the results of reloading a container network. // NetworkReloadReport describes the results of reloading a container network.
type NetworkReloadReport struct { type NetworkReloadReport struct {
//nolint:stylecheck,revive Id string //nolint:revive
Id string
Err error Err error
} }

26
pkg/domain/entities/types/pods.go
View File

@ -9,47 +9,47 @@ import (
type PodPruneReport struct { type PodPruneReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type PodPauseReport struct { type PodPauseReport struct {
Errs []error Errs []error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type PodUnpauseReport struct { type PodUnpauseReport struct {
Errs []error Errs []error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type PodStopReport struct { type PodStopReport struct {
Errs []error Errs []error
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
} }
type PodRestartReport struct { type PodRestartReport struct {
Errs []error Errs []error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type PodStartReport struct { type PodStartReport struct {
Errs []error Errs []error
Id string //nolint:revive,stylecheck Id string //nolint:revive
RawInput string RawInput string
} }
type PodRmReport struct { type PodRmReport struct {
RemovedCtrs map[string]error RemovedCtrs map[string]error
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type PodCreateReport struct { type PodCreateReport struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type PodCloneReport struct { type PodCloneReport struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
// PodStatsReport includes pod-resource statistics data. // PodStatsReport includes pod-resource statistics data.
@ -95,15 +95,15 @@ type PodInspectReport struct {
type PodKillReport struct { type PodKillReport struct {
Errs []error Errs []error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type ListPodsReport struct { type ListPodsReport struct {
Cgroup string Cgroup string
Containers []*ListPodContainer Containers []*ListPodContainer
Created time.Time Created time.Time
Id string //nolint:revive,stylecheck Id string //nolint:revive
InfraId string //nolint:revive,stylecheck InfraId string //nolint:revive
Name string Name string
Namespace string Namespace string
// Network names connected to infra container // Network names connected to infra container
@ -113,7 +113,7 @@ type ListPodsReport struct {
} }
type ListPodContainer struct { type ListPodContainer struct {
Id string //nolint:revive,stylecheck Id string //nolint:revive
Names string Names string
Status string Status string
RestartCount uint RestartCount uint

6
pkg/domain/entities/types/volumes.go
View File

@ -22,7 +22,7 @@ type VolumeCreateOptions struct {
type VolumeRmReport struct { type VolumeRmReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type VolumeInspectReport struct { type VolumeInspectReport struct {
*VolumeConfigResponse *VolumeConfigResponse
@ -38,14 +38,14 @@ type VolumeReloadReport struct {
type VolumeMountReport struct { type VolumeMountReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
Name string Name string
Path string Path string
} }
type VolumeUnmountReport struct { type VolumeUnmountReport struct {
Err error Err error
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
type VolumeConfigResponse struct { type VolumeConfigResponse struct {

2
pkg/errorhandling/errorhandling.go
View File

@ -86,7 +86,7 @@ func Contains(err error, sub error) bool {
// PodConflictErrorModel is used in remote connections with podman // PodConflictErrorModel is used in remote connections with podman
type PodConflictErrorModel struct { type PodConflictErrorModel struct {
Errs []string Errs []string
Id string //nolint:revive,stylecheck Id string //nolint:revive
} }
// ErrorModel is used in remote connections with podman // ErrorModel is used in remote connections with podman

2
pkg/k8s.io/api/core/v1/resource.go
View File

@ -27,7 +27,7 @@ func (rn ResourceName) String() string {
// Cpu returns the Cpu limit if specified. // Cpu returns the Cpu limit if specified.
// //
//nolint:revive,stylecheck //nolint:revive
func (rl *ResourceList) Cpu() *resource.Quantity { func (rl *ResourceList) Cpu() *resource.Quantity {
return rl.Name(ResourceCPU, resource.DecimalSI) return rl.Name(ResourceCPU, resource.DecimalSI)
} }

1
pkg/machine/machine_windows.go
View File

@ -36,7 +36,6 @@ const (
GlobalNameWait = 250 * time.Millisecond GlobalNameWait = 250 * time.Millisecond
) )
//nolint:stylecheck
const WM_QUIT = 0x12 const WM_QUIT = 0x12
type WinProxyOpts struct { type WinProxyOpts struct {

2
pkg/machine/wsl/util_windows.go
View File

@ -59,9 +59,7 @@ type TokenPrivileges struct {
// Cleaner to refer to the official OS constant names, and consistent with syscall // 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 // Ref: https://learn.microsoft.com/en-us/windows/win32/api/shellapi/ns-shellapi-shellexecuteinfow#members
const ( const (
//nolint:stylecheck
SEE_MASK_NOCLOSEPROCESS = 0x40 SEE_MASK_NOCLOSEPROCESS = 0x40
//nolint:stylecheck
SE_ERR_ACCESSDENIED = 0x05 SE_ERR_ACCESSDENIED = 0x05
) )

6
pkg/systemd/quadlet/quadlet.go
View File

@ -139,9 +139,9 @@ const (
KeyPull = "Pull" KeyPull = "Pull"
KeyReadOnly = "ReadOnly" KeyReadOnly = "ReadOnly"
KeyReadOnlyTmpfs = "ReadOnlyTmpfs" KeyReadOnlyTmpfs = "ReadOnlyTmpfs"
KeyRemapGid = "RemapGid" //nolint:stylecheck // deprecated KeyRemapGid = "RemapGid" // deprecated
KeyRemapUid = "RemapUid" //nolint:stylecheck // deprecated KeyRemapUid = "RemapUid" // deprecated
KeyRemapUidSize = "RemapUidSize" //nolint:stylecheck // deprecated KeyRemapUidSize = "RemapUidSize" // deprecated
KeyRemapUsers = "RemapUsers" // deprecated KeyRemapUsers = "RemapUsers" // deprecated
KeyRetry = "Retry" KeyRetry = "Retry"
KeyRetryDelay = "RetryDelay" KeyRetryDelay = "RetryDelay"

8
test/e2e/artifact_test.go
View File

@ -14,13 +14,13 @@ import (
) )
const ( const (
//nolint:revive,stylecheck //nolint:revive
ARTIFACT_SINGLE = "quay.io/libpod/testartifact:20250206-single" ARTIFACT_SINGLE = "quay.io/libpod/testartifact:20250206-single"
//nolint:revive,stylecheck //nolint:revive
ARTIFACT_MULTI = "quay.io/libpod/testartifact:20250206-multi" 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" 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" ARTIFACT_EVIL = "quay.io/libpod/testartifact:20250206-evil"
) )

8
test/e2e/common_test.go
View File

@ -44,10 +44,10 @@ import (
var ( var (
//lint:ignore ST1003 //lint:ignore ST1003
PODMAN_BINARY string //nolint:revive,stylecheck PODMAN_BINARY string //nolint:revive
INTEGRATION_ROOT string //nolint:revive,stylecheck INTEGRATION_ROOT string //nolint:revive
CGROUP_MANAGER = "systemd" //nolint:revive,stylecheck CGROUP_MANAGER = "systemd" //nolint:revive
RESTORE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE} //nolint:revive,stylecheck RESTORE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE} //nolint:revive
defaultWaitTimeout = 90 defaultWaitTimeout = 90
CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode() CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode()
) )

6
test/e2e/config.go
View File

@ -3,7 +3,7 @@
package integration package integration
var ( 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" fedoraMinimal = "quay.io/libpod/systemd-image:20240124"
ALPINE = "quay.io/libpod/alpine:latest" ALPINE = "quay.io/libpod/alpine:latest"
ALPINELISTTAG = "quay.io/libpod/alpine:3.10.2" ALPINELISTTAG = "quay.io/libpod/alpine:3.10.2"
@ -12,9 +12,9 @@ var (
ALPINEAMD64ID = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4" ALPINEAMD64ID = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4"
ALPINEARM64DIGEST = "quay.io/libpod/alpine@sha256:f270dcd11e64b85919c3bab66886e59d677cf657528ac0e4805d3c71e458e525" ALPINEARM64DIGEST = "quay.io/libpod/alpine@sha256:f270dcd11e64b85919c3bab66886e59d677cf657528ac0e4805d3c71e458e525"
ALPINEARM64ID = "915beeae46751fc564998c79e73a1026542e945ca4f73dc841d09ccc6c2c0672" 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" 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" volumeTest = "quay.io/libpod/volume-plugin-test-img:20220623"
// ImageCacheDir is initialized at runtime. // ImageCacheDir is initialized at runtime.

20
test/e2e/config_amd64.go
View File

@ -3,14 +3,14 @@
package integration package integration
var ( var (
STORAGE_FS = "overlay" //nolint:revive,stylecheck STORAGE_FS = "overlay" //nolint:revive
STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive,stylecheck STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive
ROOTLESS_STORAGE_FS = "overlay" //nolint:revive,stylecheck 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,stylecheck 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,stylecheck NGINX_IMAGE = "quay.io/libpod/alpine_nginx:latest" //nolint:revive
BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive
REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive,stylecheck REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive
CITEST_IMAGE = "quay.io/libpod/testimage:20241011" //nolint:revive,stylecheck CITEST_IMAGE = "quay.io/libpod/testimage:20241011" //nolint:revive
SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive,stylecheck SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive
CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive,stylecheck CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive
) )

20
test/e2e/config_arm64.go
View File

@ -3,14 +3,14 @@
package integration package integration
var ( var (
STORAGE_FS = "overlay" //nolint:revive,stylecheck STORAGE_FS = "overlay" //nolint:revive
STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive,stylecheck STORAGE_OPTIONS = "--storage-driver overlay" //nolint:revive
ROOTLESS_STORAGE_FS = "overlay" //nolint:revive,stylecheck 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,stylecheck 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,stylecheck NGINX_IMAGE = "quay.io/lsm5/alpine_nginx-aarch64:latest" //nolint:revive
BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive
REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive,stylecheck REGISTRY_IMAGE = "quay.io/libpod/registry:2.8.2" //nolint:revive
CITEST_IMAGE = "quay.io/libpod/testimage:20241011" //nolint:revive,stylecheck CITEST_IMAGE = "quay.io/libpod/testimage:20241011" //nolint:revive
SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive,stylecheck SYSTEMD_IMAGE = "quay.io/libpod/systemd-image:20240124" //nolint:revive
CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive,stylecheck CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive
) )

6
test/utils/utils.go
View File

@ -20,9 +20,9 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
. "github.com/onsi/ginkgo/v2" //nolint:revive,stylecheck . "github.com/onsi/ginkgo/v2" //nolint:revive
. "github.com/onsi/gomega" //nolint:revive,stylecheck . "github.com/onsi/gomega" //nolint:revive
. "github.com/onsi/gomega/gexec" //nolint:revive,stylecheck . "github.com/onsi/gomega/gexec" //nolint:revive
) )
type NetworkBackend int type NetworkBackend int