Skip to content

kola/tests: Enable Tang tests for ppc64le and aarch64 #1955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Dec 16, 2020
Merged

kola/tests: Enable Tang tests for ppc64le and aarch64 #1955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9b2e60
kola/tests: Enable Tang tests for ppc64le and aarch64
Prashanth684 Dec 8, 2020
9b517ee
Exclude aarch64 from upgrade tests
Prashanth684 Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions mantle/kola/harness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,9 +670,12 @@ ExecStart=%s
config.AddSystemdUnit(KoletExtTestUnit, unit, conf.NoState)

// Architectures using 64k pages use slightly more memory, ask for more than requested
// to make sure that we don't run out of it. Currently only ppc64le uses 64k pages.
if system.RpmArch() == "ppc64le" && targetMeta.MinMemory < 8192 {
targetMeta.MinMemory = 8192
// to make sure that we don't run out of it. Currently ppc64le and aarch64 use 64k pages.
switch system.RpmArch() {
case "ppc64le", "aarch64":
if targetMeta.MinMemory < 8192 {
targetMeta.MinMemory = 8192
}
}

t := &register.Test{
Expand Down
9 changes: 7 additions & 2 deletions mantle/kola/tests/ignition/luks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func init() {
Flags: []register.Flag{},
Distros: []string{"rhcos"},
Platforms: []string{"qemu-unpriv"},
ExcludeArchitectures: []string{"s390x", "ppc64le", "aarch64"}, // no TPM support for s390x, ppc64le, aarch64 in qemu
ExcludeArchitectures: []string{"s390x"}, // no TPM backend support for s390x
Tags: []string{"luks", "tpm", "tang", "sss", kola.NeedsInternetTag},
})
register.RegisterTest(&register.Test{
Expand All @@ -43,7 +43,7 @@ func init() {
Flags: []register.Flag{},
Distros: []string{"rhcos"},
Platforms: []string{"qemu-unpriv"},
ExcludeArchitectures: []string{"s390x", "ppc64le", "aarch64"}, // no TPM support for s390x, ppc64le, aarch64 in qemu
ExcludeArchitectures: []string{"s390x"}, // no TPM backend support for s390x
Tags: []string{"luks", "tpm", "tang", "sss", kola.NeedsInternetTag},
})
}
Expand Down Expand Up @@ -220,6 +220,11 @@ func runTest(c cluster.TestCluster, tpm2 bool, threshold int, killTangAfterFirst
opts := platform.MachineOptions{
MinMemory: 4096,
}
// ppc64le and aarch64 use 64K pages
switch system.RpmArch() {
case "ppc64le", "aarch64":
opts.MinMemory = 8192
}
m, err := c.NewMachineWithOptions(ignition, opts)
if err != nil {
c.Fatalf("Unable to create test machine: %v", err)
Expand Down
11 changes: 6 additions & 5 deletions mantle/kola/tests/rhcos/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func init() {
FailFast: true,
Tags: []string{"upgrade"},
Distros: []string{"rhcos"},
ExcludeArchitectures: []string{"s390x", "ppc64le", "aarch64"}, // no TPM support for s390x, ppc64le, aarch64 in qemu
ExcludeArchitectures: []string{"s390x", "aarch64"}, // no TPM backend support for s390x and upgrade test not valid for aarch64
UserDataV3: conf.Ignition(`{
"ignition": {
"version": "3.0.0"
Expand All @@ -56,10 +56,11 @@ func init() {
Run: rhcosUpgradeBasic,
ClusterSize: 1,
// if renaming this, also rename the command in kolet-httpd.service below
Name: "rhcos.upgrade.basic",
FailFast: true,
Tags: []string{"upgrade"},
Distros: []string{"rhcos"},
Name: "rhcos.upgrade.basic",
FailFast: true,
Tags: []string{"upgrade"},
Distros: []string{"rhcos"},
ExcludeArchitectures: []string{"aarch64"}, //upgrade test not valid for aarch64
UserDataV3: conf.Ignition(`{
"ignition": {
"version": "3.0.0"
Expand Down
6 changes: 2 additions & 4 deletions mantle/platform/qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,8 @@ func (builder *QemuBuilder) supportsFwCfg() bool {

// supportsSwtpm if the target system supports a virtual TPM device
func (builder *QemuBuilder) supportsSwtpm() bool {
switch system.RpmArch() {
// add back ppc64le as f32/f31's qemu doesn't yet support tpm device emulation
// can be removed when cosa is rebased on top of f33/qemu5.0 and also aarch64
case "s390x", "ppc64le", "aarch64":
if system.RpmArch() == "s390x" {
// ppc64le and aarch64 support TPM as of f33. s390x does not support a backend for TPM
return false
}
return true
Expand Down