diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2019-09-12 20:50:02 +0300 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2019-09-13 13:26:40 +0300 |
| commit | b4d24a692f6eb0db161d8ab1b78fc6ed7a8967ec (patch) | |
| tree | b5968636057e1832cc3e63a68fbbd181b757ad85 /jjb/global-templates-java.yaml | |
| parent | f8d14a76579cd59e2a8006def74f78cdd82f2827 (diff) | |
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
Diffstat (limited to 'jjb/global-templates-java.yaml')
| -rw-r--r-- | jjb/global-templates-java.yaml | 6 |
1 files 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}' |