Skip to content

Commit

Permalink
OCM-11748 | ci: Fix ids 65380,76501,70128
Browse files Browse the repository at this point in the history
  • Loading branch information
radtriste authored and openshift-merge-bot[bot] committed Oct 11, 2024
1 parent 6afdebf commit 0e0f03a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/e2e/account_roles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var _ = Describe("Edit Account roles", func() {
Expect(err).ToNot(HaveOccurred())
accRoleOutput, err := accService.Output()
Expect(err).ToNot(HaveOccurred())
Expect(accRoleOutput.AccountRolePrefix).To(BeEmpty())
Expect(accRoleOutput.AccountRolePrefix).ToNot(BeEmpty())

By("Create account roles with no prefix defined")
args = &exec.AccountRolesArgs{
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/cluster_edit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ var _ = Describe("Edit cluster", ci.Day2, func() {

By("Blocked registries and insecure registries have same value")
validateClusterArgAgainstErrorSubstrings(func(args *exec.ClusterArgs) {
args.RegistryConfig.RegistrySources.AllowedRegistries = nil
args.RegistryConfig.RegistrySources.BlockedRegistries = &registries
args.RegistryConfig.RegistrySources.InsecureRegistries = &registries
}, "Insecure registries should not include registries already present in blocked registries, found duplicated")
Expand Down
5 changes: 3 additions & 2 deletions tests/e2e/kubelet_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (

// nolint

"fmt"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
Expand Down Expand Up @@ -114,8 +116,7 @@ var _ = Describe("Kubelet config", func() {
Expect(len(kubeletconfigs)).To(Equal(*kcArgs.KubeletConfigNumber))
} else {
Expect(err).To(HaveOccurred())
Expect(err.Error()).Should(
MatchRegexp(`KubeletConfig for[\s\n\t]*cluster with ID '[0-9a-z]*' already exists`))
Expect(err.Error()).Should(ContainSubstring(fmt.Sprintf("KubeletConfig for cluster '%s' already exist", clusterID)))
}
})

Expand Down

0 comments on commit 0e0f03a

Please sign in to comment.