diff --git a/database/namespace_mapping.go b/database/namespace_mapping.go index 99be4584e..e230da2e0 100644 --- a/database/namespace_mapping.go +++ b/database/namespace_mapping.go @@ -65,4 +65,5 @@ var UbuntuReleasesMapping = map[string]string{ "kinetic": "22.10", "lunar": "23.04", "mantic": "23.10", + "noble": "24.04", } diff --git a/e2etests/testcase_test.go b/e2etests/testcase_test.go index eb9058fad..a155f756c 100644 --- a/e2etests/testcase_test.go +++ b/e2etests/testcase_test.go @@ -4274,5 +4274,39 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda AddedBy: "sha256:65801021513c110642748b4d5462a0e123f0b09077cda2844ef97b05135369a2", }, }, + image: "alpine:3.19.0", + registry: "https://quay.io", + source: "NVD", + username: os.Getenv("QUAY_RHACS_ENG_RO_USERNAME"), + password: os.Getenv("QUAY_RHACS_ENG_RO_PASSWORD"), + onlyCheckSpecifiedVulns: true, + namespace: "alpine:v3.19", + expectedFeatures: []apiV1.Feature{ + { + Name: "base-files", + NamespaceName: "ubuntu:23.10", + VersionFormat: "dpkg", + Version: "13ubuntu1", + AddedBy: "sha256:316675922a661ce4c35389bdeea6e9ec8d4708e41f08671b586c7aaea469b2c1", + }, + }, + }, + { + image: "quay.io/rhacs-eng/qa:ubuntu-24.04", + registry: "https://quay.io", + source: "NVD", + username: os.Getenv("QUAY_RHACS_ENG_RO_USERNAME"), + password: os.Getenv("QUAY_RHACS_ENG_RO_PASSWORD"), + onlyCheckSpecifiedVulns: true, + namespace: "ubuntu:24.04", + expectedFeatures: []apiV1.Feature{ + { + Name: "base-files", + NamespaceName: "ubuntu:24.04", + VersionFormat: "dpkg", + Version: "13ubuntu1", + AddedBy: "sha256:316675922a661ce4c35389bdeea6e9ec8d4708e41f08671b586c7aaea469b2c1", + }, + }, }, } diff --git a/pkg/wellknownnamespaces/set.go b/pkg/wellknownnamespaces/set.go index 9377388ed..a313f11d5 100644 --- a/pkg/wellknownnamespaces/set.go +++ b/pkg/wellknownnamespaces/set.go @@ -23,6 +23,8 @@ var ( "ubuntu:20.10", "ubuntu:21.04", "ubuntu:21.10", + "ubuntu:22.10", + "ubuntu:23.04", ) // KnownSupportedNamespaces is the set of base namespaces we support. @@ -47,6 +49,7 @@ var ( "alpine:v3.16", "alpine:v3.17", "alpine:v3.18", + "alpine:v3.19", "alpine:edge", "amzn:2018.03", "amzn:2", @@ -66,8 +69,7 @@ var ( "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04", - "ubuntu:22.10", - "ubuntu:23.04", "ubuntu:23.10", + "ubuntu:24.04", ) )