diff options
| -rw-r--r-- | jjb/ccsdk/dashboard.yaml | 33 | ||||
| -rw-r--r-- | jjb/ccsdk/platform-nbapi.yaml | 34 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-datarouter.yaml | 27 | ||||
| -rw-r--r-- | jjb/modeling/modeling-toscaparsers-nfvparser.yaml | 14 | ||||
| m--------- | packer/common-packer | 0 | ||||
| -rw-r--r-- | packer/vars/centos-7.json (renamed from packer/vars/centos.json) | 0 |
6 files changed, 14 insertions, 94 deletions
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml deleted file mode 100644 index f28d88145..000000000 --- a/jjb/ccsdk/dashboard.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: ccsdk-dashboard - project-name: 'ccsdk-dashboard' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - project: 'ccsdk/dashboard' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-dashboard-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 - # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' -- project: - name: ccsdk-dashboard-sonar - jobs: - - gerrit-maven-sonar - cron: 'H 11 * * *' - build-node: ubuntu1604-builder-4c-4g - project: 'ccsdk/dashboard' - project-name: 'ccsdk-dashboard' - branch: 'master' - mvn-settings: 'ccsdk-dashboard-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml deleted file mode 100644 index 9075905bf..000000000 --- a/jjb/ccsdk/platform-nbapi.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -- project: - name: ccsdk-platform-nbapi - project-name: 'ccsdk-platform-nbapi' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'ccsdk/platform/nbapi' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-platform-nbapi-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 - # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' -- project: - name: ccsdk-platform-nbapi-sonar - jobs: - - gerrit-maven-sonar - cron: 'H 11 * * *' - build-node: ubuntu1604-builder-4c-4g - project: 'ccsdk/platform/nbapi' - project-name: 'ccsdk-platform-nbapi' - branch: 'master' - mvn-settings: 'ccsdk-platform-nbapi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml deleted file mode 100644 index d9548cf01..000000000 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: dmaap-datarouter - project-name: 'dmaap-datarouter' - jobs: - - gerrit-maven-clm - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - project: 'dmaap/datarouter' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dmaap-datarouter-settings' - files: '**' - archive-artifacts: '' -- project: - name: dmaap-datarouter-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-builder-4c-4g - project: 'dmaap/datarouter' - project-name: 'dmaap-datarouter' - branch: 'master' - mvn-settings: 'dmaap-datarouter-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 5cdeea23d..c2a49e490 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -21,3 +21,17 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' + +- project: + name: modeling-toscaparsers-nfvparser-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-builder-4c-4g + project: 'modeling/toscaparsers' + project-name: 'modeling-toscaparsers-nfvparser' + branch: 'master' + mvn-params: '-f nfvparser/pom.xml' + mvn-settings: 'modeling-toscaparsers-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/packer/common-packer b/packer/common-packer -Subproject e3344fc74b1fc3e40cf8f4f7e713047373d9b17 +Subproject 1f561541e3c6a02263924e87b1e0d0bfeac2391 diff --git a/packer/vars/centos.json b/packer/vars/centos-7.json index 366202c7a..366202c7a 100644 --- a/packer/vars/centos.json +++ b/packer/vars/centos-7.json |