From 4e1bd38530daa9e619ca53f7e2016fe10aa71f97 Mon Sep 17 00:00:00 2001 From: Devtools Date: Mon, 20 Oct 2025 15:52:52 +0200 Subject: [PATCH 1/6] check email in signup response --- test/e2e/parallel/registration_service_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/parallel/registration_service_test.go b/test/e2e/parallel/registration_service_test.go index df01bbfc1..e2a76a451 100644 --- a/test/e2e/parallel/registration_service_test.go +++ b/test/e2e/parallel/registration_service_test.go @@ -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", From 28cc46da7d8bbe1931d6a25eead4de8df0a40112 Mon Sep 17 00:00:00 2001 From: Devtools Date: Tue, 21 Oct 2025 11:37:23 +0200 Subject: [PATCH 2/6] fix check --- test/e2e/parallel/registration_service_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/parallel/registration_service_test.go b/test/e2e/parallel/registration_service_test.go index e2a76a451..9dcde1c55 100644 --- a/test/e2e/parallel/registration_service_test.go +++ b/test/e2e/parallel/registration_service_test.go @@ -1037,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) } } From 8a3cdf2eba9d5ba04b3655479382aa0204bd2916 Mon Sep 17 00:00:00 2001 From: Devtools Date: Mon, 27 Oct 2025 15:21:26 +0100 Subject: [PATCH 3/6] attempt to fix install operator flag --- make/test.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/make/test.mk b/make/test.mk index eb1e4a87d..21e3ac316 100644 --- a/make/test.mk +++ b/make/test.mk @@ -87,6 +87,7 @@ e2e-migration-verify: @echo "Migration tests successfully finished" .PHONY: e2e-deploy-latest +e2e-deploy-latest: INSTALL_OPERATOR=true 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} @@ -314,6 +315,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: INSTALL_OPERATOR=true get-publish-and-install-operators: get-and-publish-host-operator create-host-resources get-and-publish-member-operator .PHONY: get-and-publish-member-operator From 6e4ef6c7affb2a74f2d7bad161780fcef15d2ec4 Mon Sep 17 00:00:00 2001 From: Devtools Date: Wed, 29 Oct 2025 15:46:25 +0100 Subject: [PATCH 4/6] revert install operator flag --- make/test.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/test.mk b/make/test.mk index 15ab30b1d..793834440 100644 --- a/make/test.mk +++ b/make/test.mk @@ -86,7 +86,7 @@ e2e-migration-verify: @echo "Migration tests successfully finished" .PHONY: e2e-deploy-latest -e2e-deploy-latest: INSTALL_OPERATOR=true +e2e-deploy-latest: 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} @@ -314,7 +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: INSTALL_OPERATOR=true +get-publish-and-install-operators: get-publish-and-install-operators: get-and-publish-host-operator create-host-resources get-and-publish-member-operator .PHONY: get-and-publish-member-operator From 42bd883fef75119d65438085de1006fec936c274 Mon Sep 17 00:00:00 2001 From: Francisc Munteanu Date: Thu, 30 Oct 2025 15:49:03 +0100 Subject: [PATCH 5/6] Update make/test.mk Co-authored-by: Rafaela Maria Soares da Silva --- make/test.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/make/test.mk b/make/test.mk index 793834440..1a607e835 100644 --- a/make/test.mk +++ b/make/test.mk @@ -86,7 +86,6 @@ e2e-migration-verify: @echo "Migration tests successfully finished" .PHONY: e2e-deploy-latest -e2e-deploy-latest: 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} From 6b3a08441d581b91b226ff3c943089135391b3f5 Mon Sep 17 00:00:00 2001 From: Francisc Munteanu Date: Thu, 30 Oct 2025 15:49:09 +0100 Subject: [PATCH 6/6] Update make/test.mk Co-authored-by: Rafaela Maria Soares da Silva --- make/test.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/make/test.mk b/make/test.mk index 1a607e835..622459451 100644 --- a/make/test.mk +++ b/make/test.mk @@ -313,7 +313,6 @@ 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: get-publish-and-install-operators: get-and-publish-host-operator create-host-resources get-and-publish-member-operator .PHONY: get-and-publish-member-operator