From: Pamela Dragosh Date: Wed, 15 Mar 2017 16:52:55 +0000 (-0400) Subject: new docker java version shell X-Git-Tag: 1.0.0-Amsterdam~565 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=2814e4d6862936a030b6da60adba976db6af8886 new docker java version shell Change-Id: I37974c6ba8f7b8035fa92b7deab155ecc4b69860 Signed-off-by: Pamela Dragosh --- diff --git a/.gitignore b/.gitignore index 7be0f754a..f4cd20b9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Ignore Mac temp files +.DS_Store + # Ignore Vim temporary files .*.sw? diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 5f2b0638a..1300dbc2f 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -668,6 +668,72 @@ - shell: '{script}' +- job-template: + name: '{project-name}-{stream}-docker-java-version-shell-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + + properties: + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - ecomp-infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - maven-exec: + maven-version: '{maven-version}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + + wrappers: + - ecomp-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 12 AM UTC + - timed: 'H 12 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - inject: + properties-file: version.properties + + - maven-target: + maven-version: '{maven-version}' + goals: 'versions:set versions:update-child-modules versions:commit' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - docker-login + + - maven-target: + maven-version: '{maven-version}' + goals: '{mvn-goals}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - shell: '{script}' + - job-template: name: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml index 073d7ed5d..5ea24cef3 100644 --- a/jjb/policy/policy-docker.yaml +++ b/jjb/policy/policy-docker.yaml @@ -11,9 +11,9 @@ mvn-goals: 'clean install prepare-package' script: !include-raw-escape: 'include-raw-docker-merge.sh' - - '{project-name}-{stream}-docker-java-shell-daily': + - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' - mvn-goals: 'clean install prepare-package' + mvn-goals: 'prepare-package' script: !include-raw-escape: 'include-raw-docker-release.sh'