diff options
135 files changed, 211 insertions, 765 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml index 754fbddd3..c89d87843 100644 --- a/jjb/aaf/aaf-authz-docker.yaml +++ b/jjb/aaf/aaf-authz-docker.yaml @@ -5,7 +5,6 @@ project-name: 'aaf-authz-docker' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java-checkstyle' - '{project-name}-{stream}-merge-properties-java': mvn_properties: diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 5e7ae8889..6e0a0f144 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -4,7 +4,6 @@ project-name: 'aaf-authz' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aaf/authz' project-name: 'aaf-authz' branch: 'master' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 34c2b43e0..63dfb73c8 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -4,7 +4,6 @@ project-name: 'aaf-cadi' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -24,7 +23,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aaf/cadi' project-name: 'aaf-cadi' branch: 'master' diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml index 7bd5efc66..51a8b5f26 100644 --- a/jjb/aaf/aaf-inno.yaml +++ b/jjb/aaf/aaf-inno.yaml @@ -4,7 +4,6 @@ project-name: 'aaf-inno' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -24,7 +23,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aaf/inno' project-name: 'aaf-inno' branch: 'master' diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml new file mode 100644 index 000000000..0cec0060d --- /dev/null +++ b/jjb/aaf/aaf-sms.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: aaf-sms + project-name: 'aaf-sms' + path: 'sms-service/src/sms' + jobs: + - '{project-name}-{stream}-verify-golang' + - '{project-name}-{stream}-merge-golang' + project: 'aaf/sms' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aaf-sms-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 4c836f9e5..31b67c6fe 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -4,7 +4,6 @@ project-name: 'aai-aai-common' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -25,7 +24,6 @@ project-name: 'aai-aai-common' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -46,7 +44,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/aai-common' project-name: 'aai-aai-common' branch: 'master' diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml deleted file mode 100644 index d63640313..000000000 --- a/jjb/aai/aai-aai-service.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- project: - name: aai-aai-service - project-name: 'aai-aai-service' - jobs: - - gerrit-maven-clm: - java-version: '' - build-timeout: 45 - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - project: 'aai/aai-service' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'aai-aai-service-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g -- project: - name: aai-aai-service-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'aai/aai-service' - project-name: 'aai-aai-service' - branch: 'master' - mvn-settings: 'aai-aai-service-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 3a24fe46a..3e16cf5fa 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -4,7 +4,6 @@ project-name: 'aai-babel' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' @@ -24,7 +23,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/babel' project-name: 'aai-babel' branch: 'master' diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index 6f0dffb5d..842a49ec2 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -4,7 +4,6 @@ project-name: 'aai-champ' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -25,7 +24,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/champ' project-name: 'aai-champ' branch: 'master' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 9cafe0b50..3606b6831 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -4,7 +4,6 @@ project-name: 'aai-data-router' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,7 +22,6 @@ project-name: 'aai-data-router' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -42,7 +40,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/data-router' project-name: 'aai-data-router' branch: 'master' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 3ed17b874..b870687fb 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -4,7 +4,6 @@ project-name: 'aai-esr-gui' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/esr-gui' project-name: 'aai-esr-gui' branch: 'master' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index c39514e31..612fe9431 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -4,7 +4,6 @@ project-name: 'aai-esr-server' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -25,7 +24,6 @@ project-name: 'aai-esr-server' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -46,7 +44,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/esr-server' project-name: 'aai-esr-server' branch: 'master' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 92110f0ec..3f755e50c 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -4,7 +4,6 @@ project-name: 'aai-event-client' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 8d6ff0f7b..691796019 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -4,7 +4,6 @@ project-name: 'aai-logging-service' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,7 +19,6 @@ project-name: 'aai-logging-service' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -38,7 +36,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/logging-service' project-name: 'aai-logging-service' branch: 'master' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index eafe2502c..0f7b1ecc6 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -4,7 +4,6 @@ project-name: 'aai-model-loader' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -24,7 +23,6 @@ project-name: 'aai-model-loader' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -44,7 +42,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/model-loader' project-name: 'aai-model-loader' branch: 'master' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 19c5e3f97..cd080b3fc 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -4,7 +4,6 @@ project-name: 'aai-resources' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ project-name: 'aai-resources' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -52,7 +50,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/resources' project-name: 'aai-resources' branch: 'master' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 37c2084a2..848a22279 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -4,7 +4,6 @@ project-name: 'aai-rest-client' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,7 +19,6 @@ project-name: 'aai-rest-client' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,7 +34,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/rest-client' project-name: 'aai-rest-client' branch: 'master' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 73a6d3a3e..e159e7f20 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -4,7 +4,6 @@ project-name: 'aai-router-core' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,7 +19,6 @@ project-name: 'aai-router-core' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,7 +34,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/router-core' project-name: 'aai-router-core' branch: 'master' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index b9cceb808..d86ea2e9b 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -4,7 +4,6 @@ project-name: 'aai-search-data-service' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,7 +22,6 @@ project-name: 'aai-search-data-service' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 87724f400..d2d0e4c16 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -4,7 +4,6 @@ project-name: 'aai-sparky-be' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,7 +22,6 @@ project-name: 'aai-sparky-be' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -42,7 +40,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/sparky-be' project-name: 'aai-sparky-be' branch: 'master' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 5c20d259e..2dab4d5e4 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -5,7 +5,6 @@ build-node: 'centos7-basebuild-4c-4g' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,7 +22,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/sparky-fe' project-name: 'aai-sparky-fe' branch: 'master' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 892cba12c..cecc7ae30 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -4,7 +4,6 @@ project-name: 'aai-traversal' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ project-name: 'aai-traversal' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -52,7 +50,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'aai/traversal' project-name: 'aai-traversal' branch: 'master' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index 49670d468..41b7de949 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -5,7 +5,6 @@ project-name: 'appc-deployment' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -25,15 +24,3 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g -- project: - name: appc-deployment-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'appc/deployment' - project-name: 'appc-deployment' - branch: 'master' - mvn-settings: 'appc-deployment-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 35cd86c04..6dd2b7123 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -4,9 +4,9 @@ project-name: 'appc' jobs: - gerrit-maven-clm: - java-version: '' mvn-params: '-DskipTests' build-timeout: 30 + build-node: ubuntu1604-basebuild-8c-8g - '{project-name}-{stream}-verify-java': build-node: ubuntu1604-basebuild-8c-8g - '{project-name}-{stream}-merge-java': @@ -26,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-8c-8g - java-version: '' project: 'appc' project-name: 'appc' branch: 'master' diff --git a/jjb/appc/appc-release.yaml b/jjb/appc/appc-release.yaml deleted file mode 100644 index b65b3d8e5..000000000 --- a/jjb/appc/appc-release.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: appc-release - project-name: 'appc' - jobs: - - gerrit-maven-clm: - java-version: '' - mvn-params: '-DskipTests' - build-timeout: 30 - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'appc' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'appc-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 08ec0f21e..6189533f7 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-dashboard' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -25,7 +24,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/dashboard' project-name: 'ccsdk-dashboard' branch: 'master' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index fe4a84037..29dfe0f1f 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-distribution' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -15,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -28,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/distribution' project-name: 'ccsdk-distribution' branch: 'master' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 1f76950ab..033f1c177 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-parent' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'ccsdk-parent-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 @@ -23,15 +20,3 @@ deployAtEnd=true files: '**' archive-artifacts: '' -- project: - name: ccsdk-parent-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'ccsdk/parent' - project-name: 'ccsdk-parent' - branch: 'master' - mvn-settings: 'ccsdk-parent-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 index 405daa63d..ce67fa14a 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-platform-nbapi' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' 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 @@ -28,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/platform/nbapi' project-name: 'ccsdk-platform-nbapi' branch: 'master' diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 846340988..90d9c29e8 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-platform-plugins' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/platform/plugins' project-name: 'ccsdk-platform-plugins' branch: 'master' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 88f69e736..38f44d3f4 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-adaptors' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'ccsdk-sli-adaptors-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 @@ -29,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/sli/adaptors' project-name: 'ccsdk-sli-adaptors' branch: 'master' diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 1de8575cb..90d350a70 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-core' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'ccsdk-sli-core-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 @@ -29,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/sli/core' project-name: 'ccsdk-sli-core' branch: 'master' diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index deb124618..99f1d98dd 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-northbound' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'ccsdk-sli-northbound-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 @@ -29,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/sli/northbound' project-name: 'ccsdk-sli-northbound' branch: 'master' diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 8a81e3485..e3d2d8e08 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-plugins' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'ccsdk-sli-plugins-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 @@ -28,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/sli/plugins' project-name: 'ccsdk-sli-plugins' branch: 'master' diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index a5c06f137..c374a4138 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-storage-pgaas' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'ccsdk-storage-pgaas-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 @@ -28,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/storage/pgaas' project-name: 'ccsdk-storage-pgaas' branch: 'master' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index f8203ac26..519e5968a 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-utils' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'ccsdk-utils-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 @@ -23,15 +20,3 @@ deployAtEnd=true files: '**' archive-artifacts: '' -- project: - name: ccsdk-utils-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'ccsdk/utils' - project-name: 'ccsdk-utils' - branch: 'master' - mvn-settings: 'ccsdk-utils-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index d648d4f36..583540684 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -5,7 +5,6 @@ project-name: 'clamp' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java-checkstyle' - '{project-name}-{stream}-merge-properties-java': mvn_properties: @@ -31,8 +30,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'clamp-settings' files: '**' archive-artifacts: '' @@ -41,11 +38,10 @@ name: clamp-sonar jobs: - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' + build-node: ubuntu1604-docker-8c-8g project: 'clamp' project-name: 'clamp' branch: 'master' mvn-settings: 'clamp-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 48f220b26..bce873e7e 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -5,7 +5,6 @@ project-name: 'cli' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -32,7 +31,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'cli' project-name: 'cli' branch: 'master' diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index 8605cf11c..a44f7b302 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -30,7 +30,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/analytics/tca' project-name: 'dcaegen2-analytics-tca' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index 5049193c1..afe2d53f6 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-analytics-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -27,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/analytics' project-name: 'dcaegen2-analytics' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index add42386a..57d7be548 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-snmptrap-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -27,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/collectors/snmptrap' project-name: 'dcaegen2-collectors-snmptrap' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 394bf9974..60b43d901 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/collectors/ves' project-name: 'dcaegen2-collectors-ves' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index 0a55b032e..ba1782c78 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -27,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/collectors' project-name: 'dcaegen2-collectors' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 0e413875c..6e4b49f3c 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/deployments' project-name: 'dcaegen2-deployments' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 296c49aa8..924ecef27 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/blueprints' project-name: 'dcaegen2-platform-blueprints' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index 70cd7a9a5..d86b81fd2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/cdapbroker' project-name: 'dcaegen2-platform-cdapbroker' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index e7e824124..df5dff034 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-cli-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -27,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/cli' project-name: 'dcaegen2-platform-cli' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index f9c9a714a..551a14b20 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/configbinding' project-name: 'dcaegen2-platform-configbinding' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 13db8951d..70b5fc59c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/deployment-handler' project-name: 'dcaegen2-platform-deployment-handler' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 14298f78f..628e3a1fe 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -31,7 +31,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/inventory-api' project-name: 'dcaegen2-platform-inventory-api' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 96287ad81..8942b5065 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/plugins' project-name: 'dcaegen2-platform-plugins' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 35a13513e..1e63696d4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/policy-handler' project-name: 'dcaegen2-platform-policy-handler' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index faa561c08..5183ba7f4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -31,7 +31,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform/servicechange-handler' project-name: 'dcaegen2-platform-servicechange-handler' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index cb7fd466f..17a2c09bc 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -26,7 +24,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/platform' project-name: 'dcaegen2-platform' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 2f0fe32ca..8e755772a 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -27,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2/utils' project-name: 'dcaegen2-utils' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 67f89298a..620179633 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -4,7 +4,6 @@ project-name: 'dcaegen2' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dcaegen2' project-name: 'dcaegen2' branch: 'master' diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index ccfb7aead..99504c29e 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -5,7 +5,6 @@ project-name: 'demo' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'demo' project-name: 'demo' branch: 'master' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 9cb73cf2d..9f3874b6a 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-buscontroller' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' @@ -26,10 +23,9 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dmaap/buscontroller' project-name: 'dmaap-buscontroller' branch: 'master' mvn-settings: 'dmaap-buscontroller-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index b0c7b0b4d..893fdba86 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-dbcapi' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-dbcapi-settings' files: '**' archive-artifacts: '' @@ -26,10 +23,9 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dmaap/dbcapi' project-name: 'dmaap-dbcapi' branch: 'master' mvn-settings: 'dmaap-dbcapi-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index e4e8b538f..d7367ac21 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-messagerouter-dmaapclient' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dmaap/messagerouter/dmaapclient' project-name: 'dmaap-messagerouter-dmaapclient' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 498ddba0b..22f043e9d 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -5,7 +5,6 @@ project-name: 'dmaap-messagerouter-docker' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index bae8d0a48..327b13ffa 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-messagerouter-messageservice' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dmaap/messagerouter/messageservice' project-name: 'dmaap-messagerouter-messageservice' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 6b085331e..6f150f123 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-messagerouter-mirroragent' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dmaap/messagerouter/mirroragent' project-name: 'dmaap-messagerouter-mirroragent' branch: 'master' diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 963ee05fe..bcb8ad7dc 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -4,7 +4,6 @@ project-name: 'dmaap-messagerouter-msgrtr' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'dmaap/messagerouter/msgrtr' project-name: 'dmaap-messagerouter-msgrtr' branch: 'master' diff --git a/jjb/global-jjb b/jjb/global-jjb -Subproject 779110b5cd63f3eabb63598a1be79d9b9ba8546 +Subproject 8e33e6ab798cd57a383cb8871d973de3fce6340 diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml new file mode 100644 index 000000000..73ebcd278 --- /dev/null +++ b/jjb/global-templates-golang.yaml @@ -0,0 +1,123 @@ +--- +- job-template: + # Job template for Golang verify jobs + # + # The purpose of this job template is to run: + # 1. make build + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + + name: '{project-name}-{stream}-verify-golang' + path: '$WORKSPACE' + + project-type: freestyle + concurrent: true + node: '{build-node}' + + 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}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - shell: | + #!/bin/bash + curl -O https://dl.google.com/go/go1.9.4.linux-amd64.tar.gz + tar -zxf go1.9.4.linux-amd64.tar.gz + export GOROOT=$WORKSPACE/go + export PATH=$PATH:$GOROOT/bin + cd $WORKSPACE/{path} + make build + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: + # Job template for Golang merge jobs + # + # The purpose of this job template is to run: + # 1. make deploy + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + + name: '{project-name}-{stream}-merge-golang' + path: $WORKSPACE + + project-type: freestyle + node: '{build-node}' + + 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: + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - shell: | + #!/bin/bash + curl -O https://dl.google.com/go/go1.9.4.linux-amd64.tar.gz + tar -zxf go1.9.4.linux-amd64.tar.gz + export GOROOT=$PWD/go + export PATH=$PATH:$GOROOT/bin + cd $WORKSPACE/{path} + make deploy + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 0c82e70c2..6ccc2b491 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -327,6 +327,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -398,6 +399,7 @@ name: '{project-name}-{stream}-release-java-daily-checkstyle' project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -473,6 +475,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -551,6 +554,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -632,6 +636,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -704,6 +709,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -1108,7 +1114,7 @@ name: '{project-name}-{stream}-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1177,6 +1183,7 @@ name: '{project-name}-{stream}-docker-java-properties-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1249,7 +1256,7 @@ name: '{project-name}-{stream}-docker-java-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1318,7 +1325,7 @@ name: '{project-name}-{stream}-docker-java-version-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1402,7 +1409,7 @@ name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1487,7 +1494,7 @@ name: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1568,7 +1575,7 @@ name: '{project-name}-{stream}-{subproject}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1650,7 +1657,7 @@ project-type: freestyle node: 'ubuntu1604-docker-8c-8g' docker-image-name: '' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1738,6 +1745,7 @@ name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + disabled: false docker-image-name: '' properties: @@ -1829,6 +1837,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -1910,6 +1919,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -1994,6 +2004,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -2211,7 +2222,7 @@ name: '{project-name}-{stream}-aai-docker-java-version-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 77e8b6533..44ba32368 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -4,7 +4,6 @@ project-name: 'holmes-common' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -24,7 +23,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'holmes/common' project-name: 'holmes-common' branch: 'master' diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml index e6511068e..dd5c3ea3d 100644 --- a/jjb/holmes/holmes-dsa.yaml +++ b/jjb/holmes/holmes-dsa.yaml @@ -4,7 +4,6 @@ project-name: 'holmes-dsa' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'holmes/dsa' project-name: 'holmes-dsa' branch: 'master' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 5573ec7d6..59df64c44 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -4,7 +4,6 @@ project-name: 'holmes-engine-management' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'holmes/engine-management' project-name: 'holmes-engine-management' branch: 'master' diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index c739e0703..0778c9a40 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -4,7 +4,6 @@ project-name: 'holmes-rule-management' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'holmes/rule-management' project-name: 'holmes-rule-management' branch: 'master' diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 5c4336163..f5c1f589c 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -4,7 +4,6 @@ project-name: 'logging-analytics' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -19,8 +18,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'logging-analytics-settings' files: '**' archive-artifacts: '' @@ -30,10 +27,9 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'logging-analytics' project-name: 'logging-analytics' branch: 'master' mvn-settings: 'logging-analytics-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index f548c956f..deac61839 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -30,7 +30,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'modeling/toscaparsers' project-name: 'modeling-toscaparsers' branch: 'master' diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index eff116850..920e47857 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -19,7 +19,6 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-python' - gerrit-maven-clm: - java-version: '' mvn-params: '-f nfvparser/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 484f2af3a..0ff0a668f 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -4,7 +4,6 @@ project-name: 'msb-apigateway' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'msb/apigateway' project-name: 'msb-apigateway' branch: 'master' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 1c4688389..1ae0b3a2e 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -4,7 +4,6 @@ project-name: 'msb-discovery' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'msb/discovery' project-name: 'msb-discovery' branch: 'master' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index effdeccd6..3cb496ba3 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -4,7 +4,6 @@ project-name: 'msb-java-sdk' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,7 +22,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'msb/java-sdk' project-name: 'msb-java-sdk' branch: 'master' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 2112551fa..b74baca8e 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -4,7 +4,6 @@ project-name: 'msb-swagger-sdk' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'msb/swagger-sdk' project-name: 'msb-swagger-sdk' branch: 'master' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 780a62ab2..0d2e7320d 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -30,7 +30,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'multicloud/framework' project-name: 'multicloud-framework' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index d07bdb7ab..af2debe23 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -30,7 +30,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'multicloud/openstack/vmware' project-name: 'multicloud-openstack-vmware' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 4677b1d7b..795175ffc 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -44,7 +44,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'multicloud/openstack' project-name: 'multicloud-openstack' branch: 'master' diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml new file mode 100644 index 000000000..e6518b9b7 --- /dev/null +++ b/jjb/music/music-distributed-kv-store.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: music-distributed-kv-store + project-name: 'music-distributed-kv-store' + path: 'src/dkv' + jobs: + - '{project-name}-{stream}-verify-golang' + - '{project-name}-{stream}-merge-golang' + project: 'music/distributed-kv-store' + stream: + - 'master': + branch: 'master' + mvn-settings: 'music-distributed-kv-store-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 65abe01ab..ae49cd00c 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -4,7 +4,6 @@ project-name: 'music' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -30,7 +29,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'music' project-name: 'music' branch: 'master' diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 0805d41c2..efb7112dd 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -4,7 +4,6 @@ project-name: 'oom-registrator' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'oom/registrator' project-name: 'oom-registrator' branch: 'master' diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index bb674dd76..8506b8c7c 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -28,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'oparent' project-name: 'oparent' branch: 'master' diff --git a/jjb/optf/optf-osdf-python.yaml b/jjb/optf/optf-osdf-python.yaml index 2daaedd17..9d4f1e239 100644 --- a/jjb/optf/optf-osdf-python.yaml +++ b/jjb/optf/optf-osdf-python.yaml @@ -7,10 +7,27 @@ - 'master': branch: 'master' mvn-settings: 'optf-osdf-settings' - build-node: 'ubuntu1604-basebuild-4c-4g' subproject: - 'osdf': path: '.' pattern: '**' + pom: 'pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-basebuild-4c-4g' +- project: + name: optf-osdf-sonar + jobs: + - gerrit-maven-sonar + build-node: ubuntu1604-basebuild-4c-4g + project: 'optf/osdf' + project-name: 'optf-osdf' + branch: 'master' + mvn-settings: 'optf-osdf-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml deleted file mode 100644 index c92d6d499..000000000 --- a/jjb/policy/policy-api.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -- project: - name: policy-api - project-name: 'policy-api' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{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: 'policy/api' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-api-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g -- project: - name: policy-api-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'policy/api' - project-name: 'policy-api' - branch: 'master' - mvn-settings: 'policy-api-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 779dbcec2..1aa1c34c7 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -4,7 +4,6 @@ project-name: 'policy-common' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,35 +20,13 @@ archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - project: - name: policy-common-release-1.0.0 - project-name: 'policy-common' - jobs: - - '{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: 'policy/common' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'policy-common-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g -- project: name: policy-common-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'policy/common' project-name: 'policy-common' branch: 'master' mvn-settings: 'policy-common-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml index f2b19e4a0..0ee0c854f 100644 --- a/jjb/policy/policy-docker.yaml +++ b/jjb/policy/policy-docker.yaml @@ -16,16 +16,11 @@ mvn-goals: 'prepare-package' script: !include-raw-escape: 'include-raw-docker-release.sh' - - '{project-name}-docker-image-blessing' project: 'policy/docker' stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 93d277e25..2ccb209ff 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -4,7 +4,6 @@ project-name: 'policy-drools-applications' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,35 +20,13 @@ archive-artifacts: '' build-node: 'ubuntu1604-basebuild-4c-4g' - project: - name: policy-drools-applications-release-1.0.0 - project-name: 'policy-drools-applications' - jobs: - - '{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: 'policy/drools-applications' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'policy-drools-applications-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-basebuild-4c-4g' -- project: name: policy-drools-applications-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'policy/drools-applications' project-name: 'policy-drools-applications' branch: 'master' mvn-settings: 'policy-drools-applications-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index ddf6fd1ca..5f48486b7 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -4,7 +4,6 @@ project-name: 'policy-drools-pdp' jobs: - gerrit-maven-clm: - java-version: '' mvn-params: '-DskipTests' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -22,35 +21,13 @@ archive-artifacts: '' build-node: 'ubuntu1604-basebuild-4c-4g' - project: - name: policy-drools-pdp-release-1.0.0 - project-name: 'policy-drools-pdp' - jobs: - - '{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: 'policy/drools-pdp' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'policy-drools-pdp-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-basebuild-4c-4g' -- project: name: policy-drools-pdp-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'policy/drools-pdp' project-name: 'policy-drools-pdp' branch: 'master' mvn-settings: 'policy-drools-pdp-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index a66e006fc..af0eed839 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -4,7 +4,6 @@ project-name: 'policy-engine' jobs: - gerrit-maven-clm: - java-version: '' build-timeout: 30 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -22,35 +21,13 @@ archive-artifacts: '' build-node: 'ubuntu1604-basebuild-4c-4g' - project: - name: policy-engine-release-1.0.0 - project-name: 'policy-engine' - jobs: - - '{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: 'policy/engine' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'policy-engine-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-basebuild-4c-4g' -- project: name: policy-engine-sonar jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'policy/engine' project-name: 'policy-engine' branch: 'master' mvn-settings: 'policy-engine-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml deleted file mode 100644 index b72be3613..000000000 --- a/jjb/policy/policy-gui.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: policy-gui - project-name: 'policy-gui' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{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: 'policy/gui' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-gui-settings' - files: '**' - archive-artifacts: '' -- project: - name: policy-gui-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'policy/gui' - project-name: 'policy-gui' - branch: 'master' - mvn-settings: 'policy-gui-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml deleted file mode 100644 index 6f6d3a158..000000000 --- a/jjb/policy/policy-pap.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: policy-pap - project-name: 'policy-pap' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{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: 'policy/pap' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-pap-settings' - files: '**' - archive-artifacts: '' -- project: - name: policy-pap-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'policy/pap' - project-name: 'policy-pap' - branch: 'master' - mvn-settings: 'policy-pap-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml deleted file mode 100644 index 1c7338966..000000000 --- a/jjb/policy/policy-pdp.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: policy-pdp - project-name: 'policy-pdp' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{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: 'policy/pdp' - stream: - - 'master': - branch: 'master' - mvn-settings: 'policy-pdp-settings' - files: '**' - archive-artifacts: '' -- project: - name: policy-pdp-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'policy/pdp' - project-name: 'policy-pdp' - branch: 'master' - mvn-settings: 'policy-pdp-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index c5e7cb8d5..6f53e330b 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -27,6 +27,8 @@ branch: 'release-1.3.1' - 'release-1.3.2': branch: 'release-1.3.2' + - 'release-2.1.0': + branch: 'release-2.1.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' @@ -36,7 +38,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'portal/sdk' project-name: 'portal-sdk' branch: 'master' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index a93091c98..10b1a1fc9 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -4,7 +4,6 @@ project-name: 'portal' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' @@ -25,7 +24,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'portal' project-name: 'portal' branch: 'master' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 58763225f..217a410bf 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-jtosca' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/jtosca' project-name: 'sdc-jtosca' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 518482ce4..30ccc79f8 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-sdc-distribution-client' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/sdc-distribution-client' project-name: 'sdc-sdc-distribution-client' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index 74a62ea59..4d510f687 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-sdc-titan-cassandra' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/sdc-titan-cassandra' project-name: 'sdc-sdc-titan-cassandra' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 5ed7e82ed..4f5c00502 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-sdc-tosca' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/sdc-tosca' project-name: 'sdc-sdc-tosca' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 8279d4c12..f2efde2da 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -4,7 +4,6 @@ project-name: 'sdc-sdc-workflow-designer' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/sdc-workflow-designer' project-name: 'sdc-sdc-workflow-designer' branch: 'master' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 17e8abfd6..9c22b7d72 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -30,7 +30,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc' project-name: 'sdc' branch: 'master' diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml deleted file mode 100644 index 991ed9390..000000000 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- project: - name: sdnc-adaptors - project-name: 'sdnc-adaptors' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-verify-java-skip-tests' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'sdnc/adaptors' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-adaptors-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: sdnc-adaptors-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'sdnc/adaptors' - project-name: 'sdnc-adaptors' - branch: 'master' - mvn-settings: 'sdnc-adaptors-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml deleted file mode 100644 index 090ea6b50..000000000 --- a/jjb/sdnc/sdnc-core.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: sdnc-core - project-name: 'sdnc-core' - subproject: - - 'rootpom': - pom: 'rootpom/pom.xml' - pattern: 'rootpom/**' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' - - '{project-name}-{stream}-verify-java-skip-tests' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'sdnc/core' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-core-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: '' - build-node: ubuntu1604-basebuild-4c-2g -- project: - name: sdnc-core-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'sdnc/core' - project-name: 'sdnc-core' - branch: 'master' - mvn-settings: 'sdnc-core-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 3e1ec1cc4..9f0dc404c 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -4,7 +4,6 @@ project-name: 'sdnc-northbound' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -13,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be @@ -30,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdnc/northbound' project-name: 'sdnc-northbound' branch: 'master' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index c5cc0fdd4..7c098d72f 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -5,7 +5,6 @@ project-name: 'sdnc-oam' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -17,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' @@ -28,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdnc/oam' project-name: 'sdnc-oam' branch: 'master' diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index 06774de23..3ce4e12e8 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -4,7 +4,6 @@ project-name: 'sdnc-plugins' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,15 +21,3 @@ deployAtEnd=true files: '**' archive-artifacts: '' -- project: - name: sdnc-plugins-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'sdnc/plugins' - project-name: 'sdnc-plugins' - branch: 'master' - mvn-settings: 'sdnc-plugins-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index eefe5caa9..c8d47023d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -4,7 +4,6 @@ project-name: 'so-libs' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'so/libs' project-name: 'so-libs' branch: 'master' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 36ef2fe8e..46b93fcd0 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -36,7 +36,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'so' project-name: 'so' branch: 'master' diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 4ec21adf1..fbe187d03 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -5,7 +5,6 @@ jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ui/dmaapbc' project-name: 'ui-dmaapbc' branch: 'master' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index fc629753c..b6715d88b 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -25,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'usecase-ui/server' project-name: 'usecase-ui-server' branch: 'master' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 749cf2b1c..82beb1339 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -25,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-8c-8g - java-version: '' project: 'usecase-ui' project-name: 'usecase-ui' branch: 'master' diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index 2f33312c0..eb7961ed4 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -11,6 +11,6 @@ chmod 755 ./zte/vmanager/docker/*.* chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh -cd nokia/deployment -mvn package -Dexec.args="buildDocker pushImage" +chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* +./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index da2c2341e..08c6a0ee6 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -16,7 +16,6 @@ pattern: 'lcm/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,7 +32,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/gvnfm/vnflcm' project-name: 'vfc-gvnfm-vnflcm' branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 3f5455c03..99b6c3e49 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -15,7 +15,6 @@ pattern: 'mgr/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -32,7 +31,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/gvnfm/vnfmgr' project-name: 'vfc-gvnfm-vnfmgr' branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 5460d2693..b8580e33e 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -16,7 +16,6 @@ pattern: 'res/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,7 +32,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/gvnfm/vnfres' project-name: 'vfc-gvnfm-vnfres' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 0e23d1ff9..50a0cf0b4 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -16,7 +16,6 @@ pattern: '**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -34,7 +33,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/catalog' project-name: 'vfc-nfvo-catalog' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 5d32025bd..b22bcf94d 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -16,7 +16,6 @@ pattern: 'ems/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,7 +32,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/driver/ems' project-name: 'vfc-nfvo-driver-ems' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 79edfb1ec..bb1bd6b6b 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -15,7 +15,6 @@ pattern: 'zte/sfc-driver/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -31,8 +30,8 @@ name: vfc-nfvo-driver-sfc-sonar jobs: - gerrit-maven-sonar + mvn-params: '-f zte/sfc-driver/pom.xml' build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/driver/sfc' project-name: 'vfc-nfvo-driver-sfc' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index c7e827ef6..207382cb0 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -26,7 +26,6 @@ - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g mvn-params: '-f huawei/pom.xml' - java-version: '' project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-svnfm-huawei' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 215c10aeb..94655151a 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -16,7 +16,6 @@ pattern: 'gvnfmadapter/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -33,7 +32,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/driver/vnfm/gvnfm' project-name: 'vfc-nfvo-driver-vnfm-gvnfm' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml index 544dcb691..1ebf20771 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml @@ -24,7 +24,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-vnfm-svnfm' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index ae29db7ab..c08037344 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -11,11 +11,10 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' subproject: - 'drv-vnfm-nokia': - pom: 'nokia/pom.xml' - pattern: 'nokia/**' + pom: 'nokia/vnfmdirver/pom.xml' + pattern: 'nokia/vnfmdriver/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -26,9 +25,8 @@ name: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar jobs: - gerrit-maven-sonar - mvn-params: '-f nokia/pom.xml' + mvn-params: '-f nokia/vnfmdriver/pom.xml' build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index 880e976fb..5a32657a8 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -16,7 +16,6 @@ pattern: 'zte/vmanager/**' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -29,7 +28,6 @@ - gerrit-maven-sonar mvn-params: '-f zte/vmanager/pom.xml' build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index 488f42db5..a93040b86 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -12,7 +12,6 @@ mvn-settings: 'vfc-nfvo-lcm-settings' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/lcm' project-name: 'vfc-nfvo-lcm' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index fab44e60f..c05cadd10 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -13,7 +13,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,7 +26,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/resmanagement' project-name: 'vfc-nfvo-resmanagement' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index d32e03c61..2086e3daf 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -23,7 +23,6 @@ !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -37,7 +36,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vfc/nfvo/wfengine' project-name: 'vfc-nfvo-wfengine' branch: 'master' diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml deleted file mode 100644 index 3b9935c62..000000000 --- a/jjb/vid/vid-asdcclient.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- project: - name: vid-asdcclient - project-name: 'vid-asdcclient' - jobs: - - gerrit-maven-clm: - java-version: '' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'vid/asdcclient' - stream: - - 'master': - branch: 'master' - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'vid-settings' - files: '**' - archive-artifacts: '' -- project: - name: vid-asdcclient-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'vid/asdcclient' - project-name: 'vid-asdcclient' - branch: 'master' - mvn-settings: 'vid-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 90508a38e..e3f588c03 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -4,7 +4,6 @@ project-name: 'vid' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' @@ -31,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vid' project-name: 'vid' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml b/jjb/vnfsdk/vnfsdk-compliance-csit.yaml deleted file mode 100644 index 6ed6fef66..000000000 --- a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vnfsdk-compliance-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vnfsdk-compliance' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: - - '{project-name}-{stream}-merge-java' - robot-options: '' - branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-compliance.yaml b/jjb/vnfsdk/vnfsdk-compliance.yaml deleted file mode 100644 index 94f647139..000000000 --- a/jjb/vnfsdk/vnfsdk-compliance.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: vnfsdk-compliance - project-name: 'vnfsdk-compliance' - jobs: - - gerrit-maven-clm: - java-version: '' - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-goals: 'docker:build' - docker-image-name: 'onap/compliance' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-profile: 'docker' - - project: 'vnfsdk/compliance' - subproject: - - 'veslibrary': - pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - pattern: 'veslibrary/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vnfsdk-compliance-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g -- project: - name: vnfsdk-compliance-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'vnfsdk/compliance' - project-name: 'vnfsdk-compliance' - branch: 'master' - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-settings: 'vnfsdk-compliance-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 2a08484fe..848871617 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -4,7 +4,6 @@ project-name: 'vnfsdk-refrepo' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'vnfsdk-refrepo-settings' files: '**' archive-artifacts: '' @@ -31,10 +28,9 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' mvn-settings: 'vnfsdk-refrepo-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 277522606..1bf4d9e52 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -4,7 +4,6 @@ project-name: 'vnfsdk-validation' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,7 +21,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml index 87d0cd3af..3e72058d0 100644 --- a/jjb/vvp/vvp-jenkins.yaml +++ b/jjb/vvp/vvp-jenkins.yaml @@ -15,7 +15,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' @@ -25,7 +24,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'vvp/jenkins' project-name: 'vvp-jenkins' branch: 'master' |