diff options
| author |   ig6133 <ig6133@intl.att.com> | 2017-04-05 14:22:42 +0300 |
|---|---|---|
| committer | ig6133 <ig6133@intl.att.com> | 2017-04-05 14:22:42 +0300 |
| commit | cb3f8233976f1bd80ed61749b2704b07158a2724 (patch) | |
| tree | cd75fec449be80bc3b78cc4199118beb59fc4e6e | |
| parent | c1f65583a8d53264d73229ef0b1aaaa2396b8984 (diff) | |
Update sdc merge template and job
Change-Id: I26581ad38a63956a79a3364915a990392300b896
Signed-off-by: ig6133 <ig6133@intl.att.com>
| -rw-r--r-- | jjb/global-templates-java.yaml | 16 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 1 |
2 files changed, 7 insertions, 10 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 5ddfe81c7..8e574a4db 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1090,7 +1090,7 @@ name: '{project-name}-{stream}-sdc-merge-java' project-type: freestyle - node: '{build-node}' + node: 'ubuntu1604-docker-8c-8g' properties: - infra-properties: @@ -1125,16 +1125,12 @@ - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' - mvn-profile: '{mvn-profile}' - docker-login - - maven-target: + - maven-docker-push-daily: maven-version: '{maven-version}' - # yamllint disable rule:line-length - goals: 'clean deploy' - # yamllint enable - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp + mvn-settings: '{mvn-settings}' + pom: '{docker-pom}' + # use default as mvn-profile if profile is not needed + mvn-profile: '{mvn-profile}' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 99f256bc5..715d5c1e7 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -6,6 +6,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-sdc-merge-java': + docker-pom: 'pom.xml' mvn-profile: 'docker' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' |