diff options
-rw-r--r-- | jjb/aai/aai-aai-service.yaml | 1 | ||||
-rw-r--r-- | jjb/aai/aai-data-router.yaml | 1 | ||||
-rw-r--r-- | jjb/aai/aai-model-loader.yaml | 1 | ||||
-rw-r--r-- | jjb/aai/aai-resources.yaml | 1 | ||||
-rw-r--r-- | jjb/aai/aai-search-data-service.yaml | 1 | ||||
-rw-r--r-- | jjb/aai/aai-sparky-be.yaml | 1 | ||||
-rw-r--r-- | jjb/aai/aai-traversal.yaml | 1 | ||||
-rw-r--r-- | jjb/appc/appc-csit.yaml | 14 | ||||
-rw-r--r-- | jjb/appc/appc-deployment.yaml | 2 | ||||
-rw-r--r-- | jjb/ccsdk/sli-core.yaml | 1 | ||||
-rw-r--r-- | jjb/dmaap/dmaap-datarouter.yaml | 2 | ||||
-rw-r--r-- | jjb/integration/integration-csit.yaml | 2 | ||||
-rw-r--r-- | jjb/sdc/sdc-jtosca.yaml | 2 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 2 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-tosca.yaml | 2 | ||||
-rw-r--r-- | jjb/usecaseui/usecase-ui-server.yaml | 16 | ||||
-rw-r--r-- | jjb/vnfsdk/vnfsdk-refrepo.yaml | 8 |
17 files changed, 45 insertions, 13 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index 1b2b31f76..01d5cfda1 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index ef347d492..0fd44b9cb 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index f93210b3c..04209dcbc 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 1269de9df..b2c1bd51a 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 80e0f52cf..eba07d899 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 426cacd63..a3ac26b35 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 8d65752ec..fa198c90f 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml new file mode 100644 index 000000000..1a364df32 --- /dev/null +++ b/jjb/appc/appc-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: appc-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'appc' + stream: 'master' + functionality: + - 'healthcheck': + trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' + robot-options: '' + branch: 'master' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index c5b0dd134..daa68ad9f 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-daily' - '{project-name}-{stream}-docker-version-java-daily' - '{project-name}-docker-image-blessing' diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index ed24c5aa7..99c71f3a3 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -23,3 +23,4 @@ deployAtEnd=true files: '**' archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 6e8a84602..89e78eca7 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'dmaap/datarouter/pom.xml' + site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'dmaap/datarouter' diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml index 7fa0ff47a..5c5d39cdf 100644 --- a/jjb/integration/integration-csit.yaml +++ b/jjb/integration/integration-csit.yaml @@ -9,5 +9,7 @@ functionality: - 'functionality1': trigger_jobs: + - 'vCPE': + trigger_jobs: robot-options: '' branch: 'master' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 89e59c902..38fbcd401 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 135e6071d..23ef85ad1 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -18,6 +18,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdc-sdc-distribution-client-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 804d26518..230fdbb19 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml new file mode 100644 index 000000000..38c7b34bf --- /dev/null +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: usecase-ui-server + project-name: 'usecase-ui-server' + project: 'usecase-ui/server' + stream: + - 'master': + branch: 'master' + mvn-settings: 'usecase-ui-server-settings' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 02de1a340..890ff8604 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -7,13 +7,13 @@ - '{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-name}-{stream}-aai-docker-java-daily': - pom: 'vnfmarket-be/deployment/docker/pom.xml' + pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' mvn-goals: 'docker:build' docker-image-name: 'onap/refrepo' + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' + mvn-profile: 'docker' project: 'vnfsdk/refrepo' stream: |