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

Fixing id:72514,id:68939,id:63139,id:63152 and updating proxy image #865

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixing id:72514,id:68939,id:63139,id:63152 and updating proxy image #865

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
8 changes: 4 additions & 4 deletions tests/e2e/classic_machine_pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,9 +706,9 @@ var _ = Describe("Create MachinePool", ci.Day2, ci.FeatureMachinepool, func() {
MachineType: helper.StringPointer("invalid"),
Name: helper.StringPointer("invalidinstype"),
}
output, err = mpService.Apply(mpArgs)
_, err = mpService.Apply(mpArgs)
Expect(err).To(HaveOccurred())
Expect(output).Should(ContainSubstring("Machine type 'invalid' is not supported"))
Expect(helper.GetTFErrorMessage(err)).Should(ContainSubstring("Machine type 'invalid' is not supported"))

By("Create machinepool creation plan with invalid tags")
invalidTags := map[string]string{
Expand All @@ -725,9 +725,9 @@ var _ = Describe("Create MachinePool", ci.Day2, ci.FeatureMachinepool, func() {
Name: helper.StringPointer(name),
Tags: helper.StringMapPointer(invalidTags),
}
output, err = mpService.Apply(mpArgs)
_, err = mpService.Apply(mpArgs)
Expect(err).To(HaveOccurred())
Expect(output).Should(ContainSubstring("Tags that begin with 'aws:' are reserved"))
Expect(helper.GetTFErrorMessage(err)).Should(ContainSubstring("Tags that begin with 'aws:' are reserved"))

})
})
Expand Down
12 changes: 7 additions & 5 deletions tests/e2e/cluster_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,15 @@ var _ = Describe("Upgrade", func() {

}

By("Validate the cluster Upgrade upgrade_acknowledge field")
clusterArgs.OpenshiftVersion = helper.StringPointer(targetV)
_, err = clusterService.Apply(clusterArgs)
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("Missing required acknowledgements to schedule upgrade"))
// Blocked by OCM-7641
// By("Validate the cluster Upgrade upgrade_acknowledge field")
// clusterArgs.OpenshiftVersion = helper.StringPointer(targetV)
// _, err = clusterService.Apply(clusterArgs)
// Expect(err).To(HaveOccurred())
// Expect(err.Error()).To(ContainSubstring("Missing required acknowledgements to schedule upgrade"))
Copy link
Contributor

Choose a reason for hiding this comment

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

May I know why common above checkpoint of missing upgrade_acknowledge?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There's currently a bug that causes the upgrade to occur even without acknowledging it. I left it commented out so that once that bug gets fixed, we can just re-enable the test. It's also already disabled for the HCP upgrade:

terraform-provider-rhcs/tests/e2e/cluster_upgrade_test.go

Line 249 in 5b15468

// Blocked by OCM-7641


By("Apply the cluster Upgrade")
clusterArgs.OpenshiftVersion = helper.StringPointer(targetV)
clusterArgs.UpgradeAcknowledgementsFor = helper.StringPointer(majorVersion)
_, err = clusterService.Apply(clusterArgs)
Expect(err).ToNot(HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/hcp_machine_pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ var _ = Describe("HCP MachinePool", ci.Day2, ci.FeatureMachinepool, func() {
By("Try to create a nodepool with wrong version")
validateMPArgAgainstErrorSubstrings(mpName, func(args *exec.MachinePoolArgs) {
args.OpenshiftVersion = helper.StringPointer("any_version")
}, "'openshift-vany_version-candidate' not found")
}, "'openshift-vany_version' not found")

By("Try to create a nodepool with autoscaling enabled and without min replicas")
validateMPArgAgainstErrorSubstrings(mpName, func(args *exec.MachinePoolArgs) {
Expand Down
7 changes: 1 addition & 6 deletions tests/e2e/idps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,17 +703,12 @@ var _ = Describe("Identity Providers", ci.Day2, ci.FeatureIDP, func() {
By("Create github idp with hostname myhost.com/aa")
args = getDefaultGitHubArgs(idpName)
args.HostedDomain = helper.StringPointer("myhost.com/aa")
validateIDPArgAgainstNoError(idpServices.github, args)
validateIDPArgAgainstErrorSubstrings(idpServices.github, args, "hostname must be a valid DNS subdomain or IP address")

By("Create github idp with hostname example.com")
args = getDefaultGitHubArgs(idpName)
args.HostedDomain = helper.StringPointer("example.com")
validateIDPArgAgainstNoError(idpServices.github, args)

By("Create github idp with empty hostname")
args = getDefaultGitHubArgs(idpName)
args.HostedDomain = helper.EmptyStringPointer
validateIDPArgAgainstErrorSubstrings(idpServices.github, args, "Attribute 'hostname' is mandatory")
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there any reason to remove this above step By("Create github idp with empty hostname")?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As far as I can tell creating an IDP without the hostname set is how you're supposed to create one that uses github.com, so it seems like it's not a mandatory argument anymore

})

It("htpasswd with empty user-password list will fail - [id:66409]", ci.Medium, func() {
Expand Down
2 changes: 1 addition & 1 deletion tests/tf-manifests/aws/proxy/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ provider "aws" {
}

locals {
proxy_image_name = "al2023-ami-2023.5.20241001.1-kernel-6.1-x86_64"
proxy_image_name = "al2023-ami-2023.6.20241212.0-kernel-6.1-x86_64"
}

data "aws_ami" "proxy_img" {
Expand Down
3 changes: 2 additions & 1 deletion tests/tf-manifests/rhcs/idps/github/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ resource "rhcs_identity_provider" "github_idp" {
client_id = var.client_id
client_secret = var.client_secret
organizations = var.organizations
hostname = var.hosted_domain
}
}
}
5 changes: 5 additions & 0 deletions tests/tf-manifests/rhcs/idps/github/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ variable "organizations" {
variable "name" {
type = string
}

variable "hosted_domain" {
type = string
default = null
}
Loading