diff options
| -rw-r--r-- | jjb/appc/appc-deployment.yaml | 25 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 155 | ||||
| -rw-r--r-- | jjb/lab/lab.yaml | 2 | ||||
| -rw-r--r-- | tox.ini | 10 |
4 files changed, 179 insertions, 13 deletions
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index c6b2c8407..964f15aec 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -8,10 +8,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - - '{project-name}-{stream}-docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - '{project-name}-docker-image-blessing' project: 'appc/deployment' @@ -26,3 +22,24 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-builder-4c-4g + +- project: + name: appc-deployment-docker + project-name: 'appc-deployment' + jobs: + - 'docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' + - 'docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' + project: 'appc/deployment' + stream: + - 'master': + branch: 'master' + - 'beijing': + branch: 'beijing' + mvn-settings: 'appc-deployment-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker + build-node: queue-docker-4c-4g diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 768392414..ef91f8182 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1202,6 +1202,7 @@ # branch: git branch (eg. stable/lithium or master) name: '{project-name}-{stream}-docker-java-daily' + id: '{project-name}-{stream}-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' disabled: '{disabled}' @@ -1259,6 +1260,75 @@ maven-version: '{maven-version}' - job-template: + # Job template for Docker daily jobs + # + # The purpose of this job template is to run: + # 1. login to the docker registry + # 2. docker push + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + + name: '{project-name}-{stream}-docker-java-daily' + id: docker-java-daily + project-type: freestyle + node: '{build-node}' + disabled: '{disabled}' + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - maven-exec: + maven-version: '{maven-version}' + - maven-params: + mvn-params: '{mvn-params}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers-docker-build: + 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}' + + - docker-login + + - maven-docker-push-daily: + maven-version: '{maven-version}' + mvn-settings: '{mvn-settings}' + pom: '{docker-pom}' + # use default as mvn-profile if profile is not needed + mvn-profile: '{mvn-profile}' + mvn-params: '{mvn-params}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + + +- job-template: # Job template for building & pushing docker images # # The purpose of this job template is to run: @@ -1588,6 +1658,7 @@ # maven-properties: properties passed to maven name: '{project-name}-{stream}-docker-version-java-daily' + id: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' disabled: '{disabled}' @@ -1661,6 +1732,90 @@ # Job template for building & pushing docker images # # The purpose of this job template is to run: + # 1. login to the docker registry + # 2. inject a version.properties file and set versions + # 3. run a docker push + # + # Required Variables: + # pom: name/location of the pom.xml file relative to the workspace + # profile: the docker profile defined in the pom + # maven-properties: properties passed to maven + + name: '{project-name}-{stream}-docker-version-java-daily' + id: 'docker-version-java-daily' + project-type: freestyle + node: '{build-node}' + disabled: '{disabled}' + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - maven-exec: + maven-version: '{maven-version}' + - maven-params: + mvn-params: '{mvn-params}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers-docker-build: + 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 -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - docker-login + + - maven-docker-push-daily: + maven-version: '{maven-version}' + mvn-settings: '{mvn-settings}' + pom: '{docker-pom}' + # use default as mvn-profile if profile is not needed + mvn-profile: '{mvn-profile}' + mvn-params: '{mvn-params}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: + # Job template for building & pushing docker images + # + # The purpose of this job template is to run: # 1. inject a version.properties file and set versions # 2. login to the docker registry # 3. run a docker push diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml index bb62728fd..15645a7eb 100644 --- a/jjb/lab/lab.yaml +++ b/jjb/lab/lab.yaml @@ -8,6 +8,8 @@ job-desc: "Heat-based deployment into Wind River lab Integration-HEAT-Daily tenant" - "windriver-oom-daily": job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Daily tenant" + - "windriver-oom-staging-daily": + job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Staging-Daily tenant" - "tlab-heat-daily": job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant" - "tlab-oom-daily": @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = coala,docs,pep8 +envlist = coala skipsdist = true [testenv:coala] @@ -11,11 +11,3 @@ deps = commands = python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger coala --non-interactive - -# [testenv:docs] -# deps = sphinx -# commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html - -[testenv:pep8] -deps = flake8 -commands = flake8 scripts/ |