diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aai/aai-babel.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-mapper.yaml | 4 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 1 | ||||
| -rw-r--r-- | jjb/policy/policy-docker.yaml | 28 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-ice-python.yaml | 21 |
5 files changed, 22 insertions, 34 deletions
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index d70472840..7c9944212 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -6,7 +6,7 @@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 8873fb765..e9c0118d6 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -7,6 +7,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-shell-daily': + mvn-goals: 'clean package docker:build -DpushImage' + # No-op + script: '/bin/true' project: 'dcaegen2/services/mapper' stream: - 'master': diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index a98457482..b1750d603 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -2169,6 +2169,7 @@ project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + build-timeout: 120 properties: - infra-properties: diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml deleted file mode 100644 index 0eb5d7f07..000000000 --- a/jjb/policy/policy-docker.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: policy-docker - project-name: 'policy-docker-policy' - jobs: - - gerrit-maven-clm - - '{project-name}-{stream}-verify-scm-mvn-script': - mvn-goals: 'clean install prepare-package' - script: - !include-raw-escape: 'include-raw-docker-verify.sh' - - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: 'clean install prepare-package' - script: - !include-raw-escape: 'include-raw-docker-merge.sh' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'prepare-package' - script: - !include-raw-escape: 'include-raw-docker-release.sh' - - project: 'policy/docker' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-docker-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index ee5b5adf8..c4a125493 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -21,19 +21,30 @@ pom: 'ice-server/pom.xml' tox-dir: 'ice-server/' tox-envs: '' + mvn-settings: 'vnfsdk-ice-settings' + build-node: ubuntu1604-builder-4c-4g + jobs: + - gerrit-maven-clm + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{subproject}-python-staging-{stream}' +- project: + name: vnfsdk-ice-docker + project-name: 'vnfsdk-ice-docker' + project: 'vnfsdk/ice' + pom: 'pom.xml' + stream: + - 'master': + branch: 'master' + subproject: - 'docker': path: 'docker' pattern: 'docker/**' pom: 'docker/pom.xml' - tox-dir: 'ice-server/' - tox-envs: '' mvn-settings: 'vnfsdk-ice-settings' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{subproject}-python-staging-{stream}' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'docker/pom.xml' mvn-profile: 'docker' |