Skip to content

OCPBUGS-87192: Add mco_extensions.go e2e test suite for MCO extension install, enable, and validation #6034

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

Open
HarshwardhanPatil07 wants to merge 5 commits into
base: main
Choose a base branch
from
+147 −93
Open

OCPBUGS-87192: Add mco_extensions.go e2e test suite for MCO extension install, enable, and validation #6034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a2ade7
Move OCP-88729 USBGuard test to mco_kernel.go and add extension RPM v…
HarshwardhanPatil07 May 13, 2026
7222f9d
OCP-88729: Optimize cleanup by deleting both MachineConfigs in one shot
HarshwardhanPatil07 May 14, 2026
2f91e47
OCP-88729: Use mc.DeleteWithWait() for cleanup instead of raw oc delete
HarshwardhanPatil07 May 25, 2026
6593406
OCP-88729: Only wait on last MachineConfig deletion to avoid double-w…
HarshwardhanPatil07 May 28, 2026
4dc05f6
OCPBUGS-78524: Create mco_extensions.go suite with USBGuard, install …
HarshwardhanPatil07 Jun 5, 2026
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
147 changes: 147 additions & 0 deletions test/extended-priv/mco_extensions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
package extended

import (
"fmt"
"regexp"
"strings"

g "github.com/onsi/ginkgo/v2"
o "github.com/onsi/gomega"
exutil "github.com/openshift/machine-config-operator/test/extended-priv/util"
logger "github.com/openshift/machine-config-operator/test/extended-priv/util/logext"
)

var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/longduration][Serial][Disruptive] MCO extensions", func() {
defer g.GinkgoRecover()

var oc = exutil.NewCLI("mco-extensions", exutil.KubeConfigPath())

g.JustBeforeEach(func() {
PreChecks(oc)
})

g.It("[PolarionID:88729] Verify USBGuard extension can be installed and enabled via MachineConfig on worker nodes [Disruptive]", func() {
testID := GetCurrentTestPolarionIDNumber()
mcp := GetCompactCompatiblePool(oc.AsAdmin())

exutil.By("Create a MachineConfig to install the usbguard extension on worker nodes")
mcExt := NewMachineConfig(oc.AsAdmin(), fmt.Sprintf("test-%s-ext", testID), mcp.GetName()).
SetMCOTemplate("change-worker-extension-usbguard.yaml")
defer mcExt.DeleteWithWait()
mcExt.create()
logger.Infof("OK!\n")

exutil.By("Create a MachineConfig to enable the usbguard systemd unit on worker nodes")
mcEnable := NewMachineConfig(oc.AsAdmin(), fmt.Sprintf("test-%s-enable", testID), mcp.GetName())
mcEnable.SetParams(fmt.Sprintf(`UNITS=[{"enabled": true, "name": "usbguard.service"}]`))
defer mcEnable.Delete()
mcEnable.create()
logger.Infof("OK!\n")

exutil.By("Verify usbguard extension is installed on all worker nodes")
nodes := mcp.GetSortedNodesOrFail()
for _, node := range nodes {
o.Expect(node.RpmIsInstalled("usbguard")).To(o.BeTrue(),
"usbguard rpm should be installed on node %s", node.GetName())
}
logger.Infof("OK!\n")

exutil.By("Verify usbguard.service is enabled on all worker nodes")
for _, node := range nodes {
o.Expect(node.IsUnitEnabled("usbguard")).To(o.BeTrue(),
"usbguard.service should be enabled on node %s", node.GetName())
}
logger.Infof("OK!\n")
})

/* Map of extensions and packages for each extension
{
"ipsec": {"NetworkManager-libreswan", "libreswan"},
"usbguard": {"usbguard"},
"kerberos": {"krb5-workstation", "libkadm5"},
"kernel-devel": {"kernel-devel", "kernel-headers"},
"sandboxed-containers": {"kata-containers"},
"sysstat": {"sysstat"},
} */
g.It("[PolarionID:56131][PolarionID:77354][OTP][LEVEL0] Install all extensions", func() {
var (
coreOSMcp = GetCoreOsCompatiblePool(oc.AsAdmin())
node = coreOSMcp.GetCoreOsNodesOrFail()[0]

query = `mcd_local_unsupported_packages{node="` + node.GetName() + `"}`
valueJSONPath = `data.result.0.value.1`

mcName = fmt.Sprintf("mco-tc-%s-all-extensions", GetCurrentTestPolarionIDNumber())

applicableExtensions, expectedRpmInstalledPackages = GetAllApplicableExtensionsToMCPOrFail(coreOSMcp)

skipDrainChecks = IsSNO(oc.AsAdmin()) // SNO clusters should NOT drain the nodes before rebooting them. The validator is not prepared for that.
behaviourValidatorApply = UpdateBehaviourValidator{
SkipDrainNodesValidation: skipDrainChecks,
Checkers: []Checker{
CommandOutputChecker{
Command: append([]string{"rpm", "-q"}, expectedRpmInstalledPackages...),
Matcher: o.MatchRegexp("(?s)" + strings.Join(expectedRpmInstalledPackages, ".*")),
ErrorMsg: "Extensions were not properly installed",
Desc: "Checking that all available extensions were properly installed",
},
},
}
)

coreOSMcp.SetWaitingTimeForExtensionsChange()
behaviourValidatorApply.Initialize(coreOSMcp, nil)

exutil.By("Create a MC to install all available extensions")
mc := NewMachineConfig(oc.AsAdmin(), mcName, coreOSMcp.GetName())
mc.parameters = []string{fmt.Sprintf(`EXTENSIONS=%s`, string(MarshalOrFail(applicableExtensions)))}
mc.skipWaitForMcp = true

defer mc.DeleteWithWait()
mc.create()
logger.Infof("OK!\n")

behaviourValidatorApply.Validate()

exutil.By("Check that no unsupported packages are reported")
monitor, err := exutil.NewMonitor(oc.AsAdmin())
o.Expect(err).NotTo(o.HaveOccurred(), "Error getting the monitor to query the metricts")

o.Eventually(monitor.SimpleQuery, "10s", "2s").WithArguments(query).Should(HavePathWithValue(valueJSONPath, o.Equal("0")),
"There are reported unsupported packages in %s", node)
logger.Infof("OK!\n")

CheckExtensions(node, applicableExtensions)

exutil.By("Delete the MC")
mc.DeleteWithWait()
logger.Infof("OK!\n")

exutil.By("Verify that extension packages where uninstalled after MC deletion")
for _, pkg := range expectedRpmInstalledPackages {
o.Expect(node.RpmIsInstalled(pkg)).To(
o.BeFalse(),
"Package %s should be uninstalled when we remove the extensions MC", pkg)
}
logger.Infof("OK!\n")
})

g.It("[PolarionID:56123][OTP] Invalid extensions should degrade the machine config pool", func() {
var (
validExtension = "usbguard"
invalidExtension = "zsh"
mcName = "mco-tc-56123-invalid-extension"
mcp = GetCompactCompatiblePool(oc)

expectedRDMessage = regexp.QuoteMeta(fmt.Sprintf("invalid extensions found: [%s]", invalidExtension)) // quotemeta to scape regex characters
expectedRDReason = ""
)

exutil.By("Create a MC with invalid extensions")
mc := NewMachineConfig(oc.AsAdmin(), mcName, mcp.GetName())
mc.parameters = []string{fmt.Sprintf(`EXTENSIONS=["%s", "%s"]`, validExtension, invalidExtension)}
mc.skipWaitForMcp = true

validateMcpRenderDegraded(mc, mcp, expectedRDMessage, expectedRDReason)
})
})
93 changes: 0 additions & 93 deletions test/extended-priv/mco_machineconfigpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ package extended

import (
"fmt"
"regexp"
"strconv"
"strings"

logger "github.com/openshift/machine-config-operator/test/extended-priv/util/logext"

Expand Down Expand Up @@ -103,78 +101,6 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/longdurati
logger.Infof("OK!\n")
})

/* Map of extensions and packages for each extension
{
"ipsec": {"NetworkManager-libreswan", "libreswan"},
"usbguard": {"usbguard"},
"kerberos": {"krb5-workstation", "libkadm5"},
"kernel-devel": {"kernel-devel", "kernel-headers"},
"sandboxed-containers": {"kata-containers"},
"sysstat": {"sysstat"},
} */
g.It("[PolarionID:56131][PolarionID:77354][OTP][LEVEL0] Install all extensions", func() {
var (
coreOSMcp = GetCoreOsCompatiblePool(oc.AsAdmin())
node = coreOSMcp.GetCoreOsNodesOrFail()[0]

query = `mcd_local_unsupported_packages{node="` + node.GetName() + `"}`
valueJSONPath = `data.result.0.value.1`

mcName = fmt.Sprintf("mco-tc-%s-all-extensions", GetCurrentTestPolarionIDNumber())

applicableExtensions, expectedRpmInstalledPackages = GetAllApplicableExtensionsToMCPOrFail(coreOSMcp)

skipDrainChecks = IsSNO(oc.AsAdmin()) // SNO clusters should NOT drain the nodes before rebooting them. The validator is not prepared for that.
behaviourValidatorApply = UpdateBehaviourValidator{
SkipDrainNodesValidation: skipDrainChecks,
Checkers: []Checker{
CommandOutputChecker{
Command: append([]string{"rpm", "-q"}, expectedRpmInstalledPackages...),
Matcher: o.MatchRegexp("(?s)" + strings.Join(expectedRpmInstalledPackages, ".*")),
ErrorMsg: "Extensions were not properly installed",
Desc: "Checking that all available extensions were properly installed",
},
},
}
)

coreOSMcp.SetWaitingTimeForExtensionsChange()
behaviourValidatorApply.Initialize(coreOSMcp, nil)

exutil.By("Create a MC to install all available extensions")
mc := NewMachineConfig(oc.AsAdmin(), mcName, coreOSMcp.GetName())
mc.parameters = []string{fmt.Sprintf(`EXTENSIONS=%s`, string(MarshalOrFail(applicableExtensions)))}
mc.skipWaitForMcp = true

defer mc.DeleteWithWait()
mc.create()
logger.Infof("OK!\n")

behaviourValidatorApply.Validate()

exutil.By("Check that no unsupported packages are reported")
monitor, err := exutil.NewMonitor(oc.AsAdmin())
o.Expect(err).NotTo(o.HaveOccurred(), "Error getting the monitor to query the metricts")

o.Eventually(monitor.SimpleQuery, "10s", "2s").WithArguments(query).Should(HavePathWithValue(valueJSONPath, o.Equal("0")),
"There are reported unsupported packages in %s", node)
logger.Infof("OK!\n")

CheckExtensions(node, applicableExtensions)

exutil.By("Delete the MC")
mc.DeleteWithWait()
logger.Infof("OK!\n")

exutil.By("Verify that extension packages where uninstalled after MC deletion")
for _, pkg := range expectedRpmInstalledPackages {
o.Expect(node.RpmIsInstalled(pkg)).To(
o.BeFalse(),
"Package %s should be uninstalled when we remove the extensions MC", pkg)
}
logger.Infof("OK!\n")
})

g.It("[PolarionID:42390][PolarionID:45318][OTP] add machine config without ignition version. Block the Machine-Config-Operator upgrade rollout if any of the pools are Degraded", func() {
createMcAndVerifyIgnitionVersion(oc, "empty ign version", "change-worker-ign-version-to-empty", "")
})
Expand Down Expand Up @@ -269,25 +195,6 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/longdurati

})

g.It("[PolarionID:56123][OTP] Invalid extensions should degrade the machine config pool", func() {
var (
validExtension = "usbguard"
invalidExtension = "zsh"
mcName = "mco-tc-56123-invalid-extension"
mcp = GetCompactCompatiblePool(oc)

expectedRDMessage = regexp.QuoteMeta(fmt.Sprintf("invalid extensions found: [%s]", invalidExtension)) // quotemeta to scape regex characters
expectedRDReason = ""
)

exutil.By("Create a MC with invalid extensions")
mc := NewMachineConfig(oc.AsAdmin(), mcName, mcp.GetName())
mc.parameters = []string{fmt.Sprintf(`EXTENSIONS=["%s", "%s"]`, validExtension, invalidExtension)}
mc.skipWaitForMcp = true

validateMcpRenderDegraded(mc, mcp, expectedRDMessage, expectedRDReason)
})

g.It("[PolarionID:70125][OTP] Test patch annotation way of updating a paused pool", func() {

var (
Expand Down