Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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: 2 additions & 0 deletions make/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ e2e-migration-verify:
@echo "Migration tests successfully finished"

.PHONY: e2e-deploy-latest
e2e-deploy-latest:
Comment thread
mfrancisc marked this conversation as resolved.
Outdated
e2e-deploy-latest:
$(MAKE) get-publish-install-and-register-operators MEMBER_NS=${MEMBER_NS} MEMBER_NS_2=${MEMBER_NS_2} HOST_NS=${HOST_NS} REGISTRATION_SERVICE_NS=${REGISTRATION_SERVICE_NS} ENVIRONMENT=${ENVIRONMENT} INSTALL_OPERATOR=${INSTALL_OPERATOR} DEPLOY_LATEST=true KSCTL_TLS_VERIFY_PARAM=${KSCTL_TLS_VERIFY_PARAM}

Expand Down Expand Up @@ -313,6 +314,7 @@ get-publish-install-and-register-operators: get-and-publish-host-operator get-an
# The reason is that when the host operator is installed, then the logic creates ToolchainConfig CR which
# defines that the webhook should be deployed from the first member instance (and not from the second one).
# This is important to set before the member operators are installed, otherwise, it can lead to flaky e2e tests.
get-publish-and-install-operators:
Comment thread
mfrancisc marked this conversation as resolved.
Outdated
get-publish-and-install-operators: get-and-publish-host-operator create-host-resources get-and-publish-member-operator

.PHONY: get-and-publish-member-operator
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/parallel/registration_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@ func TestSignupOK(t *testing.T) {
"username": userSignup.Spec.IdentityClaims.PreferredUsername,
"givenName": userSignup.Spec.IdentityClaims.GivenName,
"familyName": userSignup.Spec.IdentityClaims.FamilyName,
"email": emailAddress,
"userID": "123",
"accountID": "456",
"accountNumber": "789",
Expand Down Expand Up @@ -1036,7 +1037,7 @@ func signupHasExpectedClaims(claims map[string]string) func(c *GetSignupClient)
return func(c *GetSignupClient) {
for expectedClaim, expectedClaimValue := range claims {
actualClaimValue, claimFound := c.responseBody[expectedClaim]
require.True(c.t, claimFound, "unable to find expected claim [%s]. Claims found %v", expectedClaim, claims)
require.True(c.t, claimFound, "unable to find expected claim [%s]. Claims found %v", expectedClaim, c.responseBody)
require.Equal(c.t, expectedClaimValue, actualClaimValue, "expected claim value [%s] doesn't match actual claim value [%s]", expectedClaimValue, actualClaimValue)
}
}
Expand Down
Loading