Merge pull request #4698 from dweomer/test-selinux-enforcing
test: run tests with selinux enforcing
This commit is contained in:
		
							
								
								
									
										8
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -347,15 +347,11 @@ jobs: | |||||||
|       - name: Integration |       - name: Integration | ||||||
|         env: |         env: | ||||||
|           RUNC_FLAVOR: ${{ matrix.runc }} |           RUNC_FLAVOR: ${{ matrix.runc }} | ||||||
|           # SELinux: replace Permissive with Enforcing after https://github.com/containers/container-selinux/pull/98 |           SELINUX: Enforcing | ||||||
|           # is merged and the package becomes generally available. |  | ||||||
|           SELINUX: Permissive |  | ||||||
|         run: vagrant up --provision-with=selinux,install-runc,test-integration |         run: vagrant up --provision-with=selinux,install-runc,test-integration | ||||||
|  |  | ||||||
|       - name: CRI test |       - name: CRI test | ||||||
|         env: |         env: | ||||||
|           RUNC_FLAVOR: ${{ matrix.runc }} |           RUNC_FLAVOR: ${{ matrix.runc }} | ||||||
|           # SELinux: replace Permissive with Enforcing after https://github.com/containers/container-selinux/pull/98 |           SELINUX: Enforcing | ||||||
|           # is merged and the package becomes generally available. |  | ||||||
|           SELINUX: Permissive |  | ||||||
|         run: vagrant up --provision-with=selinux,install-runc,test-cri |         run: vagrant up --provision-with=selinux,install-runc,test-cri | ||||||
|   | |||||||
							
								
								
									
										5
									
								
								Vagrantfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								Vagrantfile
									
									
									
									
										vendored
									
									
								
							| @@ -214,9 +214,6 @@ EOF | |||||||
|   # |   # | ||||||
|   config.vm.provision "test-cri", type: "shell", run: "never" do |sh| |   config.vm.provision "test-cri", type: "shell", run: "never" do |sh| | ||||||
|     sh.upload_path = "/tmp/test-cri" |     sh.upload_path = "/tmp/test-cri" | ||||||
|     sh.env = { |  | ||||||
|         'CRITEST_ARGS': ENV['CRITEST_ARGS'], |  | ||||||
|     } |  | ||||||
|     sh.inline = <<~SHELL |     sh.inline = <<~SHELL | ||||||
|         #!/usr/bin/env bash |         #!/usr/bin/env bash | ||||||
|         source /etc/environment |         source /etc/environment | ||||||
| @@ -239,7 +236,7 @@ EOF | |||||||
|         fi |         fi | ||||||
|         trap cleanup EXIT |         trap cleanup EXIT | ||||||
|         ctr version |         ctr version | ||||||
|         critest --parallel=$(nproc) ${CRITEST_ARGS} |         critest --parallel=$(nproc) --ginkgo.skip='HostIpc is true' | ||||||
|     SHELL |     SHELL | ||||||
|   end |   end | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Michael Crosby
					Michael Crosby