github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Skip AppArmor tests on unsupported distros

Browse Source
This commit is contained in:
Kris 2017-03-15 14:59:23 -07:00
parent c0ecd93801
commit 3d05080982
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/common/apparmor.go
View File

@ -32,8 +32,11 @@ const (
appArmorDeniedPath = "/expect_permission_denied" appArmorDeniedPath = "/expect_permission_denied"
) )
// AppArmorDistros are distros with AppArmor support
var AppArmorDistros = []string{"gci", "ubuntu"}
func SkipIfAppArmorNotSupported() { func SkipIfAppArmorNotSupported() {
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu") framework.SkipUnlessNodeOSDistroIs(AppArmorDistros...)
} }
func LoadAppArmorProfiles(f *framework.Framework) { func LoadAppArmorProfiles(f *framework.Framework) {

15
test/e2e/upgrades/apparmor.go
View File

@ -34,9 +34,22 @@ type AppArmorUpgradeTest struct {
func (AppArmorUpgradeTest) Name() string { return "apparmor-upgrade" } func (AppArmorUpgradeTest) Name() string { return "apparmor-upgrade" }
func (AppArmorUpgradeTest) Skip(upgCtx UpgradeContext) bool {
var supportedImages map[string]bool
for _, d := range common.AppArmorDistros {
supportedImages[d] = true
}
for _, vCtx := range upgCtx.Versions {
if !supportedImages[vCtx.NodeImage] {
return true
}
}
return false
}
// Setup creates a secret and then verifies that a pod can consume it. // Setup creates a secret and then verifies that a pod can consume it.
func (t *AppArmorUpgradeTest) Setup(f *framework.Framework) { func (t *AppArmorUpgradeTest) Setup(f *framework.Framework) {
common.SkipIfAppArmorNotSupported()
By("Loading AppArmor profiles to nodes") By("Loading AppArmor profiles to nodes")
common.LoadAppArmorProfiles(f) common.LoadAppArmorProfiles(f)