diff options
54 files changed, 320 insertions, 189 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index f2c7860c5..8171e3276 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -18,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aaf-authz-settings' mvn-profile: docker docker-pom: 'authz-service/pom.xml' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index f10fc82b8..90e513bb8 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -8,15 +8,13 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'aaf/cadi/pom.xml' + site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'aaf/cadi' stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aaf-cadi-settings' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/aaf/aaf-csit.yaml b/jjb/aaf/aaf-csit.yaml new file mode 100644 index 000000000..aec49b368 --- /dev/null +++ b/jjb/aaf/aaf-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: aaf-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'aaf' + stream: 'master' + functionality: + - 'aafapi': + trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' + robot-options: '' + branch: 'master' diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml index b3bfbd669..eb4cb8896 100644 --- a/jjb/aaf/aaf-inno.yaml +++ b/jjb/aaf/aaf-inno.yaml @@ -8,15 +8,13 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'aaf/inno/pom.xml' + site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'aaf/inno' stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aaf-inno-settings' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/aai/aai-esr-server-csit.yaml b/jjb/aai/aai-esr-server-csit.yaml new file mode 100644 index 000000000..21bd5ae0c --- /dev/null +++ b/jjb/aai/aai-esr-server-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: aai-esr-server-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'aai-esr-server' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'aai-esr-server-master-docker-java-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml new file mode 100644 index 000000000..79b0f687e --- /dev/null +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: ccsdk-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'ccsdk' + stream: 'master' + functionality: + - 'healthcheck': + trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' + robot-options: '' + branch: 'master' diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 6fc991f0f..172fd946e 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/dashboard' stream: diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 8ed8716fd..aab9db30e 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -9,7 +9,6 @@ - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - '{project-name}-{stream}-docker-version-java-daily' - - '{project-name}-docker-image-blessing' project: 'ccsdk/distribution' stream: diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index e8a667d17..8891094b9 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/parent' stream: diff --git a/jjb/ccsdk/platform-blueprints.yaml b/jjb/ccsdk/platform-blueprints.yaml index 969d30ef7..57364a377 100644 --- a/jjb/ccsdk/platform-blueprints.yaml +++ b/jjb/ccsdk/platform-blueprints.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/platform/blueprints' stream: diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index cf7e85cd6..98a5b0a71 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/platform/nbapi' stream: diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index b21580115..7a0daca97 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/platform/plugins' stream: diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index e1ff25cc8..4443a7d62 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/sli/adaptors' stream: diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 99c71f3a3..dda266f7d 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/sli/core' stream: diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 1e505f64d..acc26ab37 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/sli/northbound' stream: diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index be14584e0..b588aacdb 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/sli/plugins' stream: diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml index 49a957233..5593e2979 100644 --- a/jjb/ccsdk/storage-esaas.yaml +++ b/jjb/ccsdk/storage-esaas.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/storage/esaas' stream: diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index e1831e539..730d9ce8e 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/storage/pgaas' stream: diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 191aa049a..6f445a122 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/utils' stream: diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index 3f567301a..2ea6d1e10 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -7,7 +7,7 @@ project-name: 'clamp' stream: 'master' functionality: - - 'TCA': + - 'APIs': trigger_jobs: - '{project-name}-{stream}-release-java-daily-checkstyle' - 'UIs': diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml new file mode 100644 index 000000000..62f53b877 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-csit.yaml @@ -0,0 +1,13 @@ +- project: + name: dcaegen2-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2' + stream: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - 'dcaegen2-master-release-version-java-daily-no-sonar' + robot-options: '' + branch: 'master' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml deleted file mode 100644 index ad94856fe..000000000 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- project: - name: dmaap-buscontroller - project-name: 'dmaap-buscontroller' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'dmaap/buscontroller/pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' - project: 'dmaap/buscontroller' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dmaap-buscontroller-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-datarouter-docker.yaml b/jjb/dmaap/dmaap-datarouter-docker.yaml deleted file mode 100644 index 873affde8..000000000 --- a/jjb/dmaap/dmaap-datarouter-docker.yaml +++ /dev/null @@ -1,34 +0,0 @@ ----
-
-- project:
- name: dmaap-datarouter-docker
- project-name: 'dmaap-datarouter-docker'
- jobs:
- - '{project-name}-{stream}-clm'
- - '{project-name}-{stream}-verify-java-checkstyle'
- - '{project-name}-{stream}-merge-properties-java':
- mvn_properties:
- - docker.pull.registry=nexus3.onap.org:10001
- - docker.push.registry=nexus3.onap.org:10003
- - '{project-name}-{stream}-release-java-daily-checkstyle':
- mvn_properties:
- - skipDockerBuild=true
- - skipDockerTag=true
- - skipDockerPush=true
- - '{project-name}-{stream}-docker-java-properties-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- maven-properties: |
- skip.docker.build=false
- skip.docker.tag=false
- skip.docker.push=false
- dmaap-datarouter-docker.registry=$
-
- project: 'dmaap/datarouter'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dmaap-datarouter-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml deleted file mode 100644 index 89e78eca7..000000000 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- project: - name: dmaap-datarouter - project-name: 'dmaap-datarouter' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' - project: 'dmaap/datarouter' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dmaap-datarouter-settings' - files: '**' - archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml deleted file mode 100644 index cc5c7d724..000000000 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- project: - name: dmaap-dbcapi - project-name: 'dmaap-dbcapi' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'dmaap/dbcapi/pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' - project: 'dmaap/dbcapi' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dmaap-dbcapi-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 655be2e6c..e5e1e231d 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 26a23d2b8..9ebc0ddf8 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -1,8 +1,8 @@ --- - project: - name: dmaap-messsagerouter-docker - project-name: 'dmaap-messsagerouter-docker' + name: dmaap-messagerouter-docker + project-name: 'dmaap-messagerouter-docker' jobs: - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' @@ -15,7 +15,7 @@ stream: - 'master': branch: 'master' - mvn-settings: 'dmaap-messsagerouter-messageservice-settings' + mvn-settings: 'dmaap-messagerouter-messageservice-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 5c5a78137..a959f8515 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-messagerouter-messageservice-settings' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 5f4a16703..9b151ed23 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -15,8 +15,6 @@ stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
files: '**'
archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index a2bba7f44..8db7b7c09 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml new file mode 100644 index 000000000..92125d4ff --- /dev/null +++ b/jjb/integration/integration-docker.yaml @@ -0,0 +1,19 @@ +--- +- project: + name: integration-docker + project-name: 'integration' + jobs: + - '{project-name}-{stream}-{subproject}-docker-merge' + - '{project-name}-{stream}-{subproject}-docker-verify' + project: 'integration' + stream: + - 'master': + branch: 'master' + subproject: + - 'sniroemulator': + pom: 'test/mocks/sniroemulator/pom.xml' + pattern: 'test/mocks/sniroemulator/**' + mvn-settings: 'integration-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml new file mode 100644 index 000000000..c8041a2a8 --- /dev/null +++ b/jjb/integration/integration-templates-docker.yaml @@ -0,0 +1,127 @@ +--- +- job-template: + name: '{project-name}-{stream}-{subproject}-docker-merge' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + docker-image-name: '' + + 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}' + - docker-image-name: + docker-image-name: '{docker-image-name}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 12 AM UTC + - timed: 'H 12 * * *' + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{pattern}' + + builders: + + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - docker-login + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'clean package docker:build docker:push' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + properties: + - docker.pull.registry=nexus3.onap.org:10001 + - docker.push.registry=nexus3.onap.org:10003 + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: + name: '{project-name}-{stream}-{subproject}-docker-verify' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + docker-image-name: '' + + 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}' + - docker-image-name: + docker-image-name: '{docker-image-name}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{pattern}' + + builders: + + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - docker-login + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'clean package docker:build' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + properties: + - docker.pull.registry=nexus3.onap.org:10001 + - docker.push.registry=nexus3.onap.org:10003 + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml new file mode 100644 index 000000000..a0ea6a65b --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: multicloud-openstack-vmware-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-vmware' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: + - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index f6927adba..bc075872d 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -14,6 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml new file mode 100644 index 000000000..0fee3ec22 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: multicloud-openstack-windriver-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-windriver' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: + - 'multicloud-openstack-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 2b94b980e..5a740bd86 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -18,6 +18,7 @@ mvn-settings: 'policy-drools-pdp-settings' files: '**' archive-artifacts: '' + build-node: 'ubuntu1604-basebuild-4c-4g' - project: name: policy-drools-pdp-release-1.0.0 project-name: 'policy-drools-pdp' diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml new file mode 100644 index 000000000..5603994b3 --- /dev/null +++ b/jjb/sdc/sdc-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: sdc-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'sdc' + stream: 'master' + functionality: + - 'healthCheck': + trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' + robot-options: '' + branch: 'master' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index e8af20473..aa2a63aee 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -8,6 +8,7 @@ - '{project-name}-{stream}-sdc-merge-java': docker-pom: 'pom.xml' mvn-profile: 'docker' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker,docker-staging' @@ -20,6 +21,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml index 517e1705c..7cace1fd0 100644 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ b/jjb/sdnc/sdnc-adaptors.yaml @@ -7,16 +7,11 @@ - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/adaptors' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-adaptors-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml index 8c12bc276..6226cacc3 100644 --- a/jjb/sdnc/sdnc-core.yaml +++ b/jjb/sdnc/sdnc-core.yaml @@ -14,16 +14,11 @@ - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/core' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-core-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 17f32f49c..a4674235b 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -7,16 +7,11 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/northbound' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index c7e22fd6f..0caab51fa 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -11,16 +11,11 @@ - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/oam' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index fa113850e..54a188575 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -7,16 +7,11 @@ - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/plugins' stream: - 'master': branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' mvn-settings: 'sdnc-plugins-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 5f36982ff..3a65a6371 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'so-libs-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index a7b2e2b0b..120a604d0 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -16,7 +16,6 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' @@ -26,8 +25,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/usecaseui/usecase-ui-server-csit.yaml new file mode 100644 index 000000000..679cc3072 --- /dev/null +++ b/jjb/usecaseui/usecase-ui-server-csit.yaml @@ -0,0 +1,13 @@ +- project: + name: usecase-ui-server-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'usecase-ui-server' + stream: 'master' + functionality: + - 'testsuite': + trigger_jobs: + - 'usecase-ui-server-{stream}-version-docker-java-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 6890831d9..6f16c12c1 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -12,6 +12,9 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-docker-java-daily' files: '**' archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 6cb182b94..6f598939a 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -12,6 +12,9 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-docker-java-daily' files: '**' archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/build-nfvo-wfengine-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-docker-image.sh new file mode 100644 index 000000000..de7d13bd1 --- /dev/null +++ b/jjb/vfc/build-nfvo-wfengine-docker-image.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./activiti-extension/src/main/docker/*.sh +./activiti-extension/src/main/docker/activiti-docker-build_image.sh + +chmod 755 ./wfenginemgrservice/src/main/docker/*.sh +./wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh + diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml index c3c89d8ec..354bd3724 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml @@ -9,6 +9,6 @@ functionality: - 'sanity-check': trigger_jobs: - - 'vfc-nfvo-resmanagement-master-docker-version-java-daily' + - 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily' robot-options: '' branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml new file mode 100644 index 000000000..91bad74ab --- /dev/null +++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-nfvo-wfengine-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-nfvo-wfengine' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-nfvo-wfengine-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index cf9bf18fe..399d934dc 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -19,6 +19,11 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-nfvo-wfengine-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml new file mode 100644 index 000000000..46e1688ed --- /dev/null +++ b/jjb/vid/vid-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vid-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vid' + stream: 'master' + functionality: + - 'healthCheck': + trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' + robot-options: '' + branch: 'master' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 5e37e0afd..2a2ce3ed0 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -10,7 +10,6 @@ - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' |