diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68e049a9e..c9135bba8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -347,15 +347,11 @@ jobs: - name: Integration env: RUNC_FLAVOR: ${{ matrix.runc }} - # SELinux: replace Permissive with Enforcing after https://github.com/containers/container-selinux/pull/98 - # is merged and the package becomes generally available. - SELINUX: Permissive + SELINUX: Enforcing run: vagrant up --provision-with=selinux,install-runc,test-integration - name: CRI test env: RUNC_FLAVOR: ${{ matrix.runc }} - # SELinux: replace Permissive with Enforcing after https://github.com/containers/container-selinux/pull/98 - # is merged and the package becomes generally available. - SELINUX: Permissive + SELINUX: Enforcing run: vagrant up --provision-with=selinux,install-runc,test-cri diff --git a/Vagrantfile b/Vagrantfile index 3d7f61515..e37cfab95 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -214,9 +214,6 @@ EOF # config.vm.provision "test-cri", type: "shell", run: "never" do |sh| sh.upload_path = "/tmp/test-cri" - sh.env = { - 'CRITEST_ARGS': ENV['CRITEST_ARGS'], - } sh.inline = <<~SHELL #!/usr/bin/env bash source /etc/environment @@ -239,7 +236,7 @@ EOF fi trap cleanup EXIT ctr version - critest --parallel=$(nproc) ${CRITEST_ARGS} + critest --parallel=$(nproc) --ginkgo.skip='HostIpc is true' SHELL end