Skip to content

Commit 414429f

Browse files
authored
Make openldap idp the last idp because console test auto uses the last idp (openshift#58915)
1 parent 8a4d537 commit 414429f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ci-operator/step-registry/idp/openldap/idp-openldap-commands.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ EOF
270270
done
271271
# This shell script and its step are mainly for coverage of Auth ldap integration in the CI jobs for real customer scenarios, thus only the ldap users/passwords will be passed down to follow-up CI steps for e2e cases' logins, the htpasswd IDP's users/passwords will not. The htpasswd IDP's users/passwords are created only for the secret creation here
272272
oc create secret generic htpasswd-secret --from-file=htpasswd=${htpass_file} -n "$MIDDLE_NAMESPACE"
273-
jq $IDP_FIELD' += [{"htpasswd":{"fileData":{"name":"htpasswd-secret"}},"mappingMethod":"claim","name":"idp-2-htpasswd-provider","type":"HTPasswd"}]' "${oauth_file_src}" > "${oauth_file_dst}"
273+
jq $IDP_FIELD' |= [{"htpasswd":{"fileData":{"name":"htpasswd-secret"}},"mappingMethod":"claim","name":"idp-2-htpasswd-provider","type":"HTPasswd"}] + .' "${oauth_file_src}" > "${oauth_file_dst}"
274274
oc replace -f "${oauth_file_dst}"
275275

276276
echo "Waiting for oauth-openshift pods to roll out"

0 commit comments

Comments
 (0)