Skip to content

Commit 9ed68e9

Browse files
renovate[bot]djsly
andauthored
chore(deps): update runc-containerd-minor (minor) (#7196)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sylvain Boily <[email protected]>
1 parent ef8f285 commit 9ed68e9

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

e2e/scenario_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,7 @@ func Test_Ubuntu2404Gen2(t *testing.T) {
18941894
containerdVersions := components.GetExpectedPackageVersions("containerd", "ubuntu", "r2404")
18951895
runcVersions := components.GetExpectedPackageVersions("runc", "ubuntu", "r2404")
18961896
ValidateContainerd2Properties(ctx, s, containerdVersions)
1897-
ValidateRunc12Properties(ctx, s, runcVersions)
1897+
ValidateRuncVersion(ctx, s, runcVersions)
18981898
ValidateContainerRuntimePlugins(ctx, s)
18991899
ValidateSSHServiceEnabled(ctx, s)
19001900
},
@@ -1946,7 +1946,7 @@ func Test_Ubuntu2404Gen2_GPUNoDriver(t *testing.T) {
19461946

19471947
ValidateNvidiaSMINotInstalled(ctx, s)
19481948
ValidateContainerd2Properties(ctx, s, containerdVersions)
1949-
ValidateRunc12Properties(ctx, s, runcVersions)
1949+
ValidateRuncVersion(ctx, s, runcVersions)
19501950
},
19511951
},
19521952
})
@@ -1964,7 +1964,7 @@ func Test_Ubuntu2404Gen1(t *testing.T) {
19641964
containerdVersions := components.GetExpectedPackageVersions("containerd", "ubuntu", "r2404")
19651965
runcVersions := components.GetExpectedPackageVersions("runc", "ubuntu", "r2404")
19661966
ValidateContainerd2Properties(ctx, s, containerdVersions)
1967-
ValidateRunc12Properties(ctx, s, runcVersions)
1967+
ValidateRuncVersion(ctx, s, runcVersions)
19681968
},
19691969
},
19701970
})
@@ -1985,7 +1985,7 @@ func Test_Ubuntu2404ARM(t *testing.T) {
19851985
containerdVersions := components.GetExpectedPackageVersions("containerd", "ubuntu", "r2404")
19861986
runcVersions := components.GetExpectedPackageVersions("runc", "ubuntu", "r2404")
19871987
ValidateContainerd2Properties(ctx, s, containerdVersions)
1988-
ValidateRunc12Properties(ctx, s, runcVersions)
1988+
ValidateRuncVersion(ctx, s, runcVersions)
19891989
},
19901990
},
19911991
})

e2e/validators.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
1414
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6"
15+
"github.com/blang/semver"
1516
"github.com/tidwall/gjson"
1617

1718
"github.com/Azure/agentbaker/e2e/config"
@@ -694,11 +695,15 @@ func ValidateNPDUnhealthyNvidiaDCGMServicesAfterFailure(ctx context.Context, s *
694695
execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(command, "\n"), 0, "failed to restart Nvidia DCGM services")
695696
}
696697

697-
func ValidateRunc12Properties(ctx context.Context, s *Scenario, versions []string) {
698+
func ValidateRuncVersion(ctx context.Context, s *Scenario, versions []string) {
698699
s.T.Helper()
699700
require.Lenf(s.T, versions, 1, "Expected exactly one version for moby-runc but got %d", len(versions))
700-
// assert versions[0] value starts with '1.2.'
701-
require.Truef(s.T, strings.HasPrefix(versions[0], "1.2."), "expected moby-runc version to start with '1.2.', got %v", versions[0])
701+
// check if versions[0] is great than or equal to 1.2.0
702+
// check semantic version
703+
semver, err := semver.ParseTolerant(versions[0])
704+
require.NoError(s.T, err, "failed to parse semver from moby-runc version")
705+
require.GreaterOrEqual(s.T, int(semver.Major), 1, "expected moby-runc major version to be at least 1, got %d", semver.Major)
706+
require.GreaterOrEqual(s.T, int(semver.Minor), 2, "expected moby-runc minor version to be at least 2, got %d", semver.Minor)
702707
ValidateInstalledPackageVersion(ctx, s, "moby-runc", versions[0])
703708
}
704709

parts/common/components.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -966,23 +966,23 @@
966966
"versionsV2": [
967967
{
968968
"renovateTag": "name=moby-runc, repository=production, os=ubuntu, release=20.04",
969-
"latestVersion": "1.2.7-ubuntu20.04u1"
969+
"latestVersion": "1.3.3-ubuntu20.04u1"
970970
}
971971
]
972972
},
973973
"r2204": {
974974
"versionsV2": [
975975
{
976976
"renovateTag": "name=moby-runc, repository=production, os=ubuntu, release=22.04",
977-
"latestVersion": "1.2.7-ubuntu22.04u1"
977+
"latestVersion": "1.3.3-ubuntu22.04u1"
978978
}
979979
]
980980
},
981981
"r2404": {
982982
"versionsV2": [
983983
{
984984
"renovateTag": "name=moby-runc, repository=production, os=ubuntu, release=24.04",
985-
"latestVersion": "1.2.7-ubuntu24.04u1"
985+
"latestVersion": "1.3.3-ubuntu24.04u1"
986986
}
987987
]
988988
}

0 commit comments

Comments
 (0)