Fix critest

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
cri-o · Feb 7, 2022 · 4a78504 · 4a78504
1 parent 2b7708c
commit 4a78504
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/contrib/test/integration/critest.yml b/contrib/test/integration/critest.yml
@@ -7,6 +7,7 @@
       [crio.runtime]
       cgroup_manager = "cgroupfs"
       conmon_cgroup = "pod"
+      seccomp_use_default_when_empty = false
 
 - name: enable and start CRI-O
   systemd:

diff --git a/internal/config/seccomp/seccomp.go b/internal/config/seccomp/seccomp.go
@@ -60,7 +60,7 @@ func (c *Config) LoadProfile(profilePath string) error {
 		c.profile.DefaultAction = seccomp.ActAllow
 		c.profile.DefaultErrnoRet = nil
 		c.profile.Syscalls = []*seccomp.Syscall{
-			&seccomp.Syscall{
+			{
 				Names: []string{
 					"bpf",
 					"clone",

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -777,11 +777,11 @@ func DefaultConfig() (*Config, error) {
 			seccompConfig:              seccompConfig,
 			apparmorConfig:             apparmor.New(),
 			blockioConfig:              blockio.New(),
-			rdtConfig:                  rdt.New(),
-			ulimitsConfig:              ulimits.New(),
 			cgroupManager:              cgroupManager,
 			deviceConfig:               device.New(),
 			namespaceManager:           nsmgr.New(defaultNamespacesDir, ""),
+			rdtConfig:                  rdt.New(),
+			ulimitsConfig:              ulimits.New(),
 		},
 		ImageConfig: ImageConfig{
 			DefaultTransport: "docker://",

diff --git a/test/critest.bats b/test/critest.bats
@@ -7,6 +7,7 @@ function setup() {
 		skip "critest because RUN_CRITEST is not set"
 	fi
 
+	export CONTAINER_SECCOMP_USE_DEFAULT_WHEN_EMPTY=false
 	setup_test
 	start_crio
 }