Remove docker login from java-merge job

This builder breaks jobs that do not have docker credentials setup.
Due to the number of jobs that currently do not support this, it
would be better to make this conditional, or create a separate job.

Change-Id: If08e128c627d964ec4bd7c9346067ada59773ba0
Issue-ID: CIMAN-217
Signed-off-by: Eric Ball <eball@linuxfoundation.org>

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index d6104d8..84d9cd0 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -613,9 +613,6 @@
 
     builders:
       - lf-infra-pre-build
-      - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'