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

Jump to bottom

kola: bump torcx deprecation major release number #466

Merged
merged 1 commit into from
Oct 17, 2023
Merged

kola: bump torcx deprecation major release number #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 4 deletions kola/tests/docker/enable_docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ func init() {
Run: dockerEnable,
ClusterSize: 1,
// This test is normally not related to the cloud environment
Platforms: []string{"qemu", "qemu-unpriv"},
Name: "docker.enable-service.torcx",
EndVersion: semver.Version{Major: 3745},
Platforms: []string{"qemu", "qemu-unpriv"},
Name: "docker.enable-service.torcx",
// Torcx was retired after release 3760.
EndVersion: semver.Version{Major: 3760},
UserData: conf.Butane(`
variant: flatcar
version: 1.0.0
Expand Down Expand Up @@ -79,5 +80,5 @@ storage:

func dockerEnable(c cluster.TestCluster) {
m := c.Machines()[0]
c.AssertCmdOutputContains(m, "systemctl is-enabled docker", "enabled")
c.AssertCmdOutputContains(m, "systemctl is-enabled docker", "enabled")
}
5 changes: 3 additions & 2 deletions kola/tests/docker/torcx_manifest_pkgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ func init() {
ExcludePlatforms: []string{"do"},
Distros: []string{"cl"},
// This test is normally not related to the cloud environment
Platforms: []string{"qemu", "qemu-unpriv"},
EndVersion: semver.Version{Major: 3745},
Platforms: []string{"qemu", "qemu-unpriv"},
// Torcx was retired after release 3760.
EndVersion: semver.Version{Major: 3760},
SkipFunc: func(version semver.Version, channel, arch, platform string) bool {
// LTS (3033) does not have the network-kargs service pulled in:
// https://github.com/flatcar/coreos-overlay/pull/1848/commits/9e04bc12c3c7eb38da05173dc0ff7beaefa13446
Expand Down
6 changes: 4 additions & 2 deletions kola/tests/sysext/disable_containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ func init() {
ClusterSize: 1,
Platforms: []string{"qemu", "qemu-unpriv"},
Name: "sysext.disable-containerd",
// Only releases after 3745 ship sysext
MinVersion: semver.Version{Major: 3746},
// Sysext containerd was introduced after release 3760.
// NOTE that 3761 is a developer version which was never released.
// However, the next largest Alpha major release shipped sysext.
MinVersion: semver.Version{Major: 3761},
// We also disable our vendor docker sysext since it depends on the containerd sysext.
UserData: conf.Butane(`
variant: flatcar
Expand Down
6 changes: 4 additions & 2 deletions kola/tests/sysext/disable_docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ func init() {
ClusterSize: 1,
Platforms: []string{"qemu", "qemu-unpriv"},
Name: "sysext.disable-docker",
// Only releases after 3745 ship sysext
MinVersion: semver.Version{Major: 3746},
// Sysext docker was introduced after release 3760.
// NOTE that 3761 is a developer version which was never released.
// However, the next largest Alpha major release shipped sysext.
MinVersion: semver.Version{Major: 3761},
UserData: conf.Butane(`
variant: flatcar
version: 1.0.0
Expand Down
11 changes: 7 additions & 4 deletions kola/tests/sysext/sysext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ func init() {
// This test is normally not related to the cloud environment
Platforms: []string{"qemu", "qemu-unpriv"},
MinVersion: semver.Version{Major: 3603},
EndVersion: semver.Version{Major: 3745},
UserData: conf.ContainerLinuxConfig(`storage:
files:
- path: /etc/extensions/test/usr/lib/extension-release.d/extension-release.test
Expand All @@ -248,7 +247,8 @@ func init() {
// This test is normally not related to the cloud environment
Platforms: []string{"qemu", "qemu-unpriv"},
MinVersion: semver.Version{Major: 3185},
EndVersion: semver.Version{Major: 3745},
// Torcx was retired after release 3760.
EndVersion: semver.Version{Major: 3760},
UserData: conf.ContainerLinuxConfig(`storage:
files:
- path: /etc/systemd/system-generators/torcx-generator
Expand All @@ -262,8 +262,11 @@ func init() {
ClusterSize: 1,
Distros: []string{"cl"},
// This test is normally not related to the cloud environment
Platforms: []string{"qemu", "qemu-unpriv"},
MinVersion: semver.Version{Major: 3746},
Platforms: []string{"qemu", "qemu-unpriv"},
// Sysext docker was introduced after release 3760.
// NOTE that 3761 is a developer version which was never released.
// However, the next largest Alpha major release shipped sysext.
MinVersion: semver.Version{Major: 3761},
UserData: conf.Butane(`
variant: flatcar
version: 1.0.0
Expand Down