Add same fix with redhat-developer#4206.

Add some fix for importing java imagestream.

scripts/configure-installer-tests-cluster-s390x.sh

@@ -16,7 +16,7 @@ KUBEADMIN_PASSWORD_FILE=${KUBEADMIN_PASSWORD_FILE:-"${DEFAULT_INSTALLER_ASSETS_D
 export KUBECONFIG=${KUBECONFIG:-"${DEFAULT_INSTALLER_ASSETS_DIR}/auth/kubeconfig"}
 
 # list of namespace to create
-IMAGE_TEST_NAMESPACES="openjdk-11-rhel8 nodejs-12-rhel7 nodejs-12"
+IMAGE_TEST_NAMESPACES="openjdk-11-rhel8 nodejs-12-rhel7 nodejs-12 openjdk-11"
 
 # Attempt resolution of kubeadmin, only if a CI is not set
 if [ -z $CI ]; then
@@ -73,9 +73,13 @@ sleep 5
 oc import-image nodejs:latest --from=registry.redhat.io/rhscl/nodejs-12-rhel7 --confirm -n openshift
 sleep 5
 oc annotate istag/nodejs:latest tags=builder -n openshift --overwrite
+oc delete istag java:8 -n openshift
+sleep 5
 oc import-image java:8 --namespace=openshift --from=registry.redhat.io/redhat-openjdk-18/openjdk18-openshift --confirm
 sleep 5
 oc annotate istag/java:8 --namespace=openshift tags=builder --overwrite
+oc delete istag java:latest -n openshift
+sleep 5
 oc import-image java:latest --namespace=openshift --from=registry.redhat.io/redhat-openjdk-18/openjdk18-openshift --confirm
 sleep 5
 oc annotate istag/java:latest --namespace=openshift tags=builder --overwrite
@@ -100,10 +104,6 @@ oc annotate istag/python:latest --namespace=openshift tags=builder --overwrite
 
 sh $AUTH_SCRIPT
 
-KUBEADMIN_PASSWORD=`cat $KUBEADMIN_PASSWORD_FILE`
-oc login -u $KUBEADMIN_USER -p $KUBEADMIN_PASSWORD &> /dev/null
-oc get secret pull-secret -n openshift-config -o yaml | sed "s/openshift-config/myproject/g" | oc apply -f -
-
 # Project list
 oc projects