diff options
| -rw-r--r-- | jjb/global-templates-java.yaml | 69 | ||||
| -rw-r--r-- | jjb/oom/oom-consul.yaml | 53 | ||||
| -rw-r--r-- | jjb/portal/portal.yaml | 1 |
3 files changed, 53 insertions, 70 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index b55c6c8a6..f2e08881b 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -135,75 +135,6 @@ files: '{obj:pattern}' - job-template: - # Job template for Java daily release jobs - # - # The purpose of this job template is to run: - # 1. maven clean deploy with Sonar scans - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-release-java-daily' - - project-type: freestyle - node: '{build-node}' - disabled: '{disabled}' - maven-deploy-properties: - 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}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 11 AM UTC - - timed: '@daily' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - lf-infra-pre-build - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - maven-target: - maven-version: '{maven-version}' - goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=512m' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: # Job template for Java daily release jobs running checkstyle at the end # When checkstyle will be fully incorporated, it is meant to replace # '{project-name}-{stream}-release-java-daily' diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml index bb0b2dde0..b466f19e0 100644 --- a/jjb/oom/oom-consul.yaml +++ b/jjb/oom/oom-consul.yaml @@ -12,3 +12,56 @@ build-node: centos7-builder-2c-1g jobs: - gerrit-info-yaml-verify + +- project: + name: oom-consul-linters + project: oom/consul + project-name: oom-consul + python-version: python3 + jobs: + - oom-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'py': + tox-dir: '.' + tox-envs: 'python' + pattern: '**/*.python' + stream: + - 'master': + branch: 'master' + - 'frankfurt': + branch: 'frankfurt' + + +- project: + name: oom-consul-release + project-name: oom-consul + project: oom/consul + mvn-settings: 'oom-settings' + jobs: + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + +- project: + name: 'oom-consul-docker' + jobs: + - gerrit-docker-verify + - gerrit-docker-merge + project-name: 'oom-consul' + project: 'oom/consul' + stream: + - 'master': + branch: 'master' + files: '' + docker-name: 'onap/oom/consul' + docker-build-args: '-f ./Dockerfile' + docker-root: '$WORKSPACE' + mvn-settings: 'oom-settings' + build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index cb6bc9ebf..2a6d6e5a0 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -13,7 +13,6 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - '{project-name}-{stream}-release-java-daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g |