Skip to content
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

kola: Exclude Docker torcx tests for Edge Channel #87

Merged
merged 2 commits into from
Apr 16, 2020
Merged

kola: Exclude Docker torcx tests for Edge Channel #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f80f3f
Revert "kola: skip Docker torcx tests in case of Edge channel"
sayanchowdhury Apr 15, 2020
e72e475
kola: Exclude Docker torcx tests for Edge Channel
sayanchowdhury Apr 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
36 changes: 3 additions & 33 deletions kola/tests/docker/torcx_docker_flag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
package docker

import (
"fmt"
"regexp"
"strings"

"github.com/coreos/go-semver/semver"
"github.com/coreos/mantle/kola/cluster"
"github.com/coreos/mantle/kola/register"
"github.com/coreos/mantle/platform"
Expand All @@ -40,7 +37,8 @@ storage:
inline: yes
mode: 0644
`),
Distros: []string{"cl"},
Distros: []string{"cl"},
ExcludeChannels: []string{"edge"},
})
register.Register(&register.Test{
Run: dockerTorcxFlagFileCloudConfig,
Expand All @@ -54,22 +52,13 @@ write_files:
`),
Distros: []string{"cl"},
ExcludePlatforms: []string{"qemu-unpriv"},
ExcludeChannels: []string{"edge"},
})
}

func dockerTorcxFlagFile(c cluster.TestCluster) {
m := c.Machines()[0]

// Skip the test in case of Edge, e.g. "xxxx.99.z"
ver := strings.Split(string(c.MustSSH(m, "grep ^VERSION_ID= /etc/os-release")), "=")[1]
semver, err := parseCLVersion(ver)
if err != nil {
c.Fatalf("cannot parse Flatcar version: %v", err)
}
if semver.Minor == int64(99) {
c.Skipf("skipping tests for Edge %s", semver.String())
}

// flag=yes
checkTorcxDockerVersions(c, m, `^1\.12$`, `^1\.12\.`)

Expand All @@ -85,16 +74,6 @@ func dockerTorcxFlagFile(c cluster.TestCluster) {
func dockerTorcxFlagFileCloudConfig(c cluster.TestCluster) {
m := c.Machines()[0]

// Skip the test in case of Edge, e.g. "xxxx.99.z"
ver := strings.Split(string(c.MustSSH(m, "grep ^VERSION_ID= /etc/os-release")), "=")[1]
semver, err := parseCLVersion(ver)
if err != nil {
c.Fatalf("cannot parse Flatcar version: %v", err)
}
if semver.Minor == int64(99) {
c.Skipf("skipping tests for Edge %s", semver.String())
}

// cloudinit runs after torcx
if err := m.Reboot(); err != nil {
c.Fatalf("couldn't reboot: %v", err)
Expand All @@ -115,12 +94,3 @@ func checkTorcxDockerVersions(c cluster.TestCluster, m platform.Machine, expecte
c.Errorf("version %s did not match %q", ver, expectedVerRE)
}
}

func parseCLVersion(input string) (*semver.Version, error) {
version, err := semver.NewVersion(input)
if err != nil {
return nil, fmt.Errorf("parsing os-release semver: %v", err)
}

return version, nil
}