Add config to docker login
Currently the docker login conditional builder from java-merge job is
missing the settings file with the credentials [1]. Moved the builder
after the configuration files are set.
[1] https://jenkins.onap.org/job/policy-docker-amd64-master-merge-java/5/console
Issue-ID: CIMAN-217
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Change-Id: I3aa441e5baef6aad1c9e2ade051e5b0bfc0c0030
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 1e16acd..bfc9c25 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -613,15 +613,15 @@
builders:
- lf-infra-pre-build
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
- conditional-step:
condition-kind: regex-match
regex: .*(amd64|arm64).*
label: '{project-name}'
steps:
- shell: !include-raw-escape: global-jjb/shell/docker-login.sh
- - provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
- maven-target:
maven-version: '{maven-version}'
pom: '{obj:pom}'