From b4d24a692f6eb0db161d8ab1b78fc6ed7a8967ec Mon Sep 17 00:00:00 2001 From: Cristina Pauna Date: Thu, 12 Sep 2019 20:50:02 +0300 Subject: 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 Change-Id: I3aa441e5baef6aad1c9e2ade051e5b0bfc0c0030 --- jjb/global-templates-java.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 1e16acd19..bfc9c253d 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}' -- cgit 1.2.3-korg