Skip to content

ROSAENG-60640 | test: Fixing day1-negative test cases #3317

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
jerichokeyne wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −23
Open

ROSAENG-60640 | test: Fixing day1-negative test cases #3317

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
2 changes: 1 addition & 1 deletion tests/e2e/test_rosacli_account_roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ var _ = Describe("Edit account roles", labels.Feature.AccountRoles, func() {
Expect(textData).To(ContainSubstring("WARN: There are no hosted CP account roles to be deleted"))
})
It("create/delete classic account roles with managed policies - [id:57408]",
labels.Critical, labels.Runtime.OCMResources,
labels.Critical, labels.Runtime.OCMResources, labels.Exclude,

@olucasfreitas olucasfreitas Jul 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a brief comment or link to a tracking issue explaining why this critical-labeled test is being excluded?

func() {

var (
Expand Down
51 changes: 30 additions & 21 deletions tests/e2e/test_rosacli_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2486,35 +2486,49 @@ var _ = Describe("HCP cluster creation negative testing",
var (
rosaClient *rosacli.Client
clusterService rosacli.ClusterService
profilesMap map[string]*handler.Profile
profile *handler.Profile
customProfile *handler.Profile
command string
rosalCommand config.Command
clusterHandler handler.ClusterHandler
err error
)
BeforeEach(func() {

By("Init the client")
rosaClient = rosacli.NewClient()
clusterService = rosaClient.Cluster

// Get a random profile
profilesMap = handler.ParseProfilesByFile(path.Join(ciConfig.Test.YAMLProfilesDir, "rosa-hcp.yaml"))
profilesNames := make([]string, 0, len(profilesMap))
for k := range profilesMap {
profilesNames = append(profilesNames, k)
By("Prepare custom profile")
customProfile = &handler.Profile{
ClusterConfig: &handler.ClusterConfig{
HCP: true,
MultiAZ: true,
STS: true,
OIDCConfig: "managed",
NetworkingSet: true,
BYOVPC: true,
Zones: "",
Autoscale: false,
PrivateLink: false,
DefaultIngressPrivate: false,
},
AccountRoleConfig: &handler.AccountRoleConfig{
Path: "",
PermissionBoundary: "",
},
Version: "y-1",
ChannelGroup: "stable",
Region: constants.CommonAWSRegion,
}
profile = profilesMap[profilesNames[helper.RandomInt(len(profilesNames))]]
profile.NamePrefix = constants.DefaultNamePrefix
clusterHandler, err = handler.NewTempClusterHandler(rosaClient, profile)
customProfile.NamePrefix = constants.DefaultNamePrefix
clusterHandler, err = handler.NewTempClusterHandler(rosaClient, customProfile)
Expect(err).To(BeNil())

By("Init the cluster id and testing cluster name")

@olucasfreitas olucasfreitas Jul 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This By has no code between it and the next By -- looks like a leftover from removing the random profile logic.

By("Prepare creation command")
flags, err := clusterHandler.GenerateClusterCreateFlags()
Expect(err).To(BeNil())

command = "rosa create cluster --cluster-name " + profile.ClusterConfig.Name + " " + strings.Join(flags, " ")
command = "rosa create cluster --cluster-name " + customProfile.ClusterConfig.Name + " " + strings.Join(flags, " ")
rosalCommand = config.GenerateCommand(command)
})

Expand Down Expand Up @@ -2714,27 +2728,24 @@ var _ = Describe("HCP cluster creation negative testing",
"ERR: External authentication configuration is only supported for a Hosted Control Plane cluster."))

By("Create HCP cluster with --external-auth-providers-enabled and cluster version lower than 4.15")
cg := rosalCommand.GetFlagValue("--channel-group", true)
if cg == "" {
cg = rosacli.VersionChannelGroupStable
}
cg := rosacli.VersionChannelGroupStable
versionList, err := rosaClient.Version.ListAndReflectVersions(cg, rosalCommand.CheckFlagExist("--hosted-cp"))
Expect(err).To(BeNil())
Expect(versionList).ToNot(BeNil())
previousVersionsList, err := versionList.FindNearestBackwardMinorVersion("4.14", 0, true)
Expect(err).ToNot(HaveOccurred())
foundVersion := previousVersionsList.Version

replacingFlags := map[string]string{
"-c": clusterName,
"--cluster-name": clusterName,
"--domain-prefix": clusterName,
"--version": foundVersion,
"--channel-group": cg,
}
rosalCommand.ReplaceFlagValue(replacingFlags)
if !rosalCommand.CheckFlagExist("--external-auth-providers-enabled") {
rosalCommand.AddFlags("--dry-run", "--external-auth-providers-enabled", "-y")
} else {
rosalCommand.AddFlags("--dry-run", "-y")
rosalCommand.AddFlags("--external-auth-providers-enabled")

@olucasfreitas olucasfreitas Jul 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--dry-run was removed here during refactoring but rosalCommand doesn't include it by default (unlike CreateDryRun). Without it, this runs a real create cluster command. Should be re-added for safety.

}
output, err = rosaClient.Runner.RunCMD(strings.Split(rosalCommand.GetFullCommand(), " "))
Expect(err).To(HaveOccurred())
Expand Down Expand Up @@ -2840,7 +2851,6 @@ var _ = Describe("HCP cluster creation negative testing",
}
rosalCommand.ReplaceFlagValue(replacingFlags)
rosalCommand.AddFlags("--dry-run", "-y")
log.Logger.Debug(profile.Name)
log.Logger.Debug(strings.Split(rosalCommand.GetFullCommand(), " "))

By("Create classic cluster with audit log arn")
Expand Down Expand Up @@ -2974,7 +2984,6 @@ var _ = Describe("HCP cluster creation negative testing",
}
rosalCommand.ReplaceFlagValue(replacingFlags)
rosalCommand.AddFlags("--dry-run", "-y")
log.Logger.Debug(profile.Name)
log.Logger.Debug(strings.Split(rosalCommand.GetFullCommand(), " "))

rosalCommand.AddFlags("--registry-config-allowed-registries-for-import", "test.com:invalid")
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/exec/rosacli/cluster_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func (c *clusterService) List() (bytes.Buffer, error) {
}

func (c *clusterService) CreateDryRun(clusterName string, flags ...string) (bytes.Buffer, error) {
combflags := append([]string{"-c", clusterName, "--dry-run"}, flags...)
combflags := append([]string{"-c", clusterName, "--dry-run", "--mode=auto", "--yes"}, flags...)
createDryRun := c.client.Runner.
Cmd("create", "cluster").
CmdFlags(combflags...)
Expand Down