From: Bengt Thuree Date: Thu, 25 Oct 2018 22:58:10 +0000 (+0000) Subject: Merge "Update memcached/redis packer templates" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0f21fefbec467cf08124e7c191408fbb47d6feeb;hp=6d248e4339947cbaa239d7f1dfbb781fd856659f;p=ci-management.git Merge "Update memcached/redis packer templates" --- diff --git a/.gitmodules b/.gitmodules index 0fbb91acd..4e7fbade6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ -[submodule "jjb/global-jjb"] - path = jjb/global-jjb +[submodule "global-jjb"] + path = global-jjb url = https://github.com/lfit/releng-global-jjb [submodule "packer/common-packer"] path = packer/common-packer diff --git a/global-jjb b/global-jjb new file mode 160000 index 000000000..e907c5af3 --- /dev/null +++ b/global-jjb @@ -0,0 +1 @@ +Subproject commit e907c5af374f9d7bf3196543d853921697dbf17c diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index cc5d85e8e..ea6767ce0 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -1,9 +1,9 @@ DOCKER_REGISTRY=nexus3.onap.org DOCKERHUB_REGISTRY=docker.io GERRIT_URL=https://gerrit.onap.org/r -GIT_BASE=ssh://ecomp-jobbuilder@gerrit.onap.org:29418/$PROJECT -GIT_NO_PROJECT=ssh://ecomp-jobbuilder@gerrit.onap.org:29418 -GIT_URL=ssh://ecomp-jobbuilder@gerrit.onap.org:29418 +GIT_BASE=git://cloud.onap.org/mirror/$PROJECT.git +GIT_NO_PROJECT=git://cloud.onap.org/mirror +GIT_URL=git://cloud.onap.org/mirror JENKINS_HOSTNAME=vex-yul-ecomp-jenkins-1 JIRA_URL=https://jira.onap.org LOGS_REPO_URL=https://nexus.onap.org/service/local/repositories/logs diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index 83ce04bf7..9fad0a137 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -1,9 +1,9 @@ DOCKER_REGISTRY=nexus3.onap.org DOCKERHUB_REGISTRY=docker.io GERRIT_URL=https://gerrit.onap.org/r -GIT_BASE=ssh://ecomp-jobbuilder@gerrit.onap.org:29418/$PROJECT -GIT_NO_PROJECT=ssh://ecomp-jobbuilder@gerrit.onap.org:29418 -GIT_URL=ssh://ecomp-jobbuilder@gerrit.onap.org:29418 +GIT_BASE=git://cloud.onap.org/mirror/$PROJECT.git +GIT_NO_PROJECT=git://cloud.onap.org/mirror +GIT_URL=git://cloud.onap.org/mirror JENKINS_HOSTNAME=vex-yul-ecomp-jenkins-2 JIRA_URL=https://jira.onap.org LOGS_REPO_URL=https://nexus.onap.org/service/local/repositories/logs diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 047e66837..a4568a1f9 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -3,7 +3,6 @@ name: aaf-authz project-name: 'aaf-authz' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,12 @@ mvn-settings: 'aaf-authz-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: aaf-authz-clm + jobs: + - gerrit-maven-clm + project: 'aaf/authz' + project-name: 'aaf-authz' + branch: 'master' + mvn-settings: 'aaf-authz-settings' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 336001e14..0ef86c0c2 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -3,7 +3,6 @@ name: aaf-cadi project-name: 'aaf-cadi' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -104,3 +103,12 @@ mvn-settings: 'aaf-cadi-settings' files: '**' archive-artifacts: '' + +- project: + name: aaf-cadi-clm + jobs: + - gerrit-maven-clm + project: 'aaf/cadi' + project-name: 'aaf-cadi' + branch: 'master' + mvn-settings: 'aaf-cadi-settings' diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml index a4c514ab7..9853e52d3 100644 --- a/jjb/aaf/aaf-luaplugin.yaml +++ b/jjb/aaf/aaf-luaplugin.yaml @@ -1,13 +1,9 @@ --- - project: - name: aaf-luaplugin + name: aaf-luaplugin-clm project-name: 'aaf-luaplugin' jobs: - gerrit-maven-clm project: 'aaf/luaplugin' - stream: - - 'master': - branch: 'master' + branch: 'master' mvn-settings: 'aaf-luaplugin-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml index e0b79889a..3e0e8cdfa 100644 --- a/jjb/aaf/aaf-sms.yaml +++ b/jjb/aaf/aaf-sms.yaml @@ -4,6 +4,7 @@ project-name: 'aaf-sms' subproject: 'aaf-sms-client' path: 'sms-service/src' + golangver: 'golang111' jobs: - '{project-name}-{stream}-verify-golang' - '{project-name}-{stream}-merge-golang' diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index d083f62b1..37cdb1f99 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -10,6 +10,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: '**' @@ -24,7 +26,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-aai-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -37,6 +39,6 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 91c7dac0e..1b2a9e686 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' files: '**' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/cacher' project-name: 'aai-cacher' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-cacher-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -40,7 +42,7 @@ - gerrit-maven-clm project: 'aai/cacher' project-name: 'aai-cacher' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 6f85de024..2b29487df 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' files: '**' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/graphadmin' project-name: 'aai-graphadmin' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-graphadmin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -40,6 +42,6 @@ - gerrit-maven-clm project: 'aai/graphadmin' project-name: 'aai-graphadmin' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index af670d4a9..ef87c104a 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' files: '**' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/resources' project-name: 'aai-resources' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-resources-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -40,6 +42,6 @@ - gerrit-maven-clm project: 'aai/resources' project-name: 'aai-resources' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index fa7719ba6..259598070 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -14,12 +14,3 @@ mvn-settings: 'aai-sparky-fe-settings' files: '**' archive-artifacts: '' - -- project: - name: aai-sparky-fe-clm - jobs: - - gerrit-maven-clm - project: 'aai/sparky-fe' - project-name: 'aai-sparky-fe' - branch: 'master' - mvn-settings: 'aai-sparky-fe-settings' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 82385bf49..058a2852f 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' files: '**' @@ -28,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/traversal' project-name: 'aai-traversal' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-traversal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -40,6 +42,6 @@ - gerrit-maven-clm project: 'aai/traversal' project-name: 'aai-traversal' - branch: 'master' + branch: 'casablanca' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml index be7e1f71a..c610857cb 100644 --- a/jjb/appc/appc-cdt.yaml +++ b/jjb/appc/appc-cdt.yaml @@ -3,7 +3,6 @@ name: appc-cdt project-name: 'appc-cdt' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,3 +15,13 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: appc-cdt-clm + jobs: + - gerrit-maven-clm + project: 'appc/cdt' + project-name: 'appc-cdt' + branch: 'master' + mvn-settings: 'appc-cdt-settings' + diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index 040913b18..fc4567a09 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -4,7 +4,6 @@ name: appc-deployment project-name: 'appc-deployment' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,6 +26,8 @@ jobs: - 'docker-java-daily': mvn-params: '-Dmaven.test.skip=true' + - 'docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' project: 'appc/deployment' stream: - 'master': @@ -37,3 +38,13 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: queue-docker-4c-4g + +- project: + name: appc-deployment-clm + jobs: + - gerrit-maven-clm + project: 'appc/deployment' + project-name: 'appc-deployment' + branch: 'master' + mvn-settings: 'appc-deployment-settings' + diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index ed973ec57..1fdba4d9f 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -3,10 +3,6 @@ name: appc-master project-name: 'appc' jobs: - - gerrit-maven-clm: - mvn-params: '-DskipTests' - build-timeout: 30 - build-node: ubuntu1604-builder-8c-8g - '{project-name}-{stream}-verify-java': build-node: ubuntu1604-builder-8c-8g - '{project-name}-{stream}-merge-java': @@ -35,3 +31,15 @@ mvn-settings: 'appc-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx4096m' + +- project: + name: appc-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-DskipTests' + build-timeout: 30 + build-node: ubuntu1604-builder-8c-8g + project: 'appc' + project-name: 'appc' + branch: 'master' + mvn-settings: 'appc-settings' diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 8d0cd1136..2b183bc73 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -3,7 +3,6 @@ name: ccsdk-apps project-name: 'ccsdk-apps' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-apps-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 @@ -35,18 +36,28 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: ccsdk-apps-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/apps' + project-name: 'ccsdk-apps' + branch: 'master' + mvn-settings: 'ccsdk-apps-settings' + build-node: ubuntu1604-builder-4c-4g + - project: name: ccsdk-apps-docker project-name: 'ccsdk-apps' jobs: - - 'docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - 'docker-version-java-daily': mvn-params: '-Dmaven.test.skip=true' project: 'ccsdk/apps' stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-apps-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 44d203078..2890a4e43 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -5,7 +5,11 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'ccsdk' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index c93263077..ebedf9a01 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -3,7 +3,6 @@ name: ccsdk-distribution project-name: 'ccsdk-distribution' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -11,6 +10,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -22,17 +23,28 @@ name: ccsdk-distribution-docker project-name: 'ccsdk-distribution' jobs: - - 'docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - 'docker-version-java-daily': mvn-params: '-Dmaven.test.skip=true' project: 'ccsdk/distribution' stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker build-node: queue-docker-4c-4g + +- project: + name: ccsdk-distribution-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/distribution' + project-name: 'ccsdk-distribution' + branch: 'master' + mvn-settings: 'ccsdk-distribution-settings' + build-node: ubuntu1604-docker-8c-8g + diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index fc7020f2b..9c36c8ed4 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -3,7 +3,6 @@ name: ccsdk-features project-name: 'ccsdk-features' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-features-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 @@ -34,3 +35,13 @@ mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-features-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/features' + project-name: 'ccsdk-features' + branch: 'master' + mvn-settings: 'ccsdk-features-settings' + build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 2efb907aa..3edf720fa 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -3,7 +3,6 @@ name: ccsdk-parent project-name: 'ccsdk-parent' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' 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 @@ -20,3 +21,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' + +- project: + name: ccsdk-parent-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/parent' + project-name: 'ccsdk-parent' + branch: 'master' + mvn-settings: 'ccsdk-parent-settings' + build-node: ubuntu1604-builder-4c-4g + diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 817b5b6d1..aeb79a6d3 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -3,7 +3,6 @@ name: ccsdk-platform-plugins project-name: 'ccsdk-platform-plugins' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-platform-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 @@ -34,3 +35,14 @@ mvn-settings: 'ccsdk-platform-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-platform-plugins-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/platform/plugins' + project-name: 'ccsdk-platform-plugins' + branch: 'master' + mvn-settings: 'ccsdk-platform-plugins-settings' + build-node: centos7-redis-4c-4g + diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 06785a5f1..d2a85f3ef 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -3,7 +3,6 @@ name: ccsdk-sli-adaptors project-name: 'ccsdk-sli-adaptors' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' 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 @@ -34,3 +35,14 @@ mvn-settings: 'ccsdk-sli-adaptors-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-adaptors-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/sli/adaptors' + project-name: 'ccsdk-sli-adaptors' + branch: 'master' + mvn-settings: 'ccsdk-sli-adaptors-settings' + build-node: ubuntu1604-builder-4c-4g + diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index c23a10eab..c2192c0b4 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -3,7 +3,6 @@ name: ccsdk-sli-core project-name: 'ccsdk-sli-core' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' 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 @@ -21,6 +22,7 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + - project: name: ccsdk-sli-core-sonar jobs: @@ -33,3 +35,14 @@ mvn-settings: 'ccsdk-sli-core-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-core-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/sli/core' + project-name: 'ccsdk-sli-core' + branch: 'master' + mvn-settings: 'ccsdk-sli-core-settings' + build-node: ubuntu1604-builder-4c-4g + diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 9b71c92e0..ff932d42a 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -3,7 +3,6 @@ name: ccsdk-sli-northbound project-name: 'ccsdk-sli-northbound' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' 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 @@ -34,3 +35,14 @@ mvn-settings: 'ccsdk-sli-northbound-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-northbound-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/sli/northbound' + project-name: 'ccsdk-sli-northbound' + branch: 'master' + mvn-settings: 'ccsdk-sli-northbound-settings' + build-node: ubuntu1604-builder-4c-4g + diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 4c011a05e..e0e81047f 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -3,7 +3,6 @@ name: ccsdk-sli-plugins project-name: 'ccsdk-sli-plugins' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' 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 @@ -20,6 +21,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + - project: name: ccsdk-sli-plugins-sonar jobs: @@ -32,3 +34,13 @@ mvn-settings: 'ccsdk-sli-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-plugins-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/sli/plugins' + project-name: 'ccsdk-sli-plugins' + branch: 'master' + mvn-settings: 'ccsdk-sli-plugins-settings' + diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 192899adf..1ad5b1ac8 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -3,7 +3,6 @@ name: ccsdk-utils project-name: 'ccsdk-utils' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' 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 @@ -20,3 +21,13 @@ deployAtEnd=true files: '**' archive-artifacts: '' + +- project: + name: ccsdk-utils-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/utils' + project-name: 'ccsdk-utils' + branch: 'master' + mvn-settings: 'ccsdk-utils-settings' + diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 52c496db1..04b2f3601 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -30,11 +30,9 @@ archive-artifacts: '**/*.log' build-node: centos7-builder-2c-1g - build-timeout: 60 + build-timeout: 90 platforms: - - centos-7 - - centos-7-arm64 - ubuntu-16.04 - ubuntu-18.04-arm64 templates: docker diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index ea556523a..c590426ab 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -4,8 +4,6 @@ name: clamp project-name: 'clamp' jobs: - - gerrit-maven-clm: - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' - '{project-name}-{stream}-verify-java-checkstyle': mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' - '{project-name}-{stream}-merge-properties-java': @@ -46,3 +44,15 @@ mvn-settings: 'clamp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: clamp-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + project: 'clamp' + project-name: 'clamp' + branch: 'master' + mvn-settings: 'clamp-settings' + build-node: ubuntu1604-docker-8c-8g + diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 87b03b4eb..8522709bc 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -4,7 +4,6 @@ name: cli project-name: 'cli' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'cli-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: cli-clm + jobs: + - gerrit-maven-clm + project: 'cli' + project-name: 'cli' + branch: 'master' + mvn-settings: 'cli-settings' + build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index c3d7720b4..79bb19f98 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -18,7 +18,6 @@ build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-verify-java': mvn-params: '-DskipTests=true' @@ -36,3 +35,13 @@ mvn-settings: 'dcaegen2-analytics-tca-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-analytics-tca-clm + jobs: + - gerrit-maven-clm + project: 'dcaegen2/analytics/tca' + project-name: 'dcaegen2-analytics-tca' + branch: 'master' + build-node: ubuntu1604-builder-4c-4g + mvn-settings: 'dcaegen2-analytics-tca-settings' diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index f127a4927..904f749ce 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -15,7 +15,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -31,3 +30,13 @@ mvn-settings: 'dcaegen2-analytics-pnda-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-analytics-pnda-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/analytics/pnda + build-node: ubuntu1604-builder-4c-4g + project-name: 'dcaegen2-analytics-pnda' + branch: 'master' + mvn-settings: 'dcaegen2-analytics-pnda-settings' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 47b0d58bd..82129efdc 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -15,7 +15,6 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java': - '{project-name}-{stream}-merge-java': mvn-goals: 'clean install' @@ -37,3 +36,13 @@ mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-analytics-tca-gen2-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/analytics/tca-gen2 + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-analytics-tca-gen2' + branch: 'master' + mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 165295eb7..8a230b2c4 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -15,7 +15,6 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-collectors-datafile-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-collectors-datafile-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/datafile + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-collectors-datafile' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-datafile-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 2508076de..b9caca737 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -15,7 +15,6 @@ archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html' build-node: ubuntu1604-docker-8c-8g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' - '{project-name}-{stream}-merge-java': @@ -26,3 +25,12 @@ # No-op script: '/bin/true' +- project: + name: dcaegen2-collectors-hv-ves-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/hv-ves + project-name: 'dcaegen2-collectors-hv-ves' + branch: 'master' + build-node: ubuntu1604-docker-8c-8g + mvn-settings: 'dcaegen2-collectors-hv-ves-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 812b22fcd..4aa9a8c36 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -3,7 +3,6 @@ name: dcaegen2-collectors-restconf project-name: 'dcaegen2-collectors-restconf' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-collectors-restconf-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-collectors-restconf-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/restconf + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-collectors-restconf' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-restconf-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index f74f6c03c..b0fe67853 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -3,7 +3,6 @@ name: dcaegen2-collectors-snmptrap project-name: 'dcaegen2-collectors-snmptrap' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-collectors-snmptrap-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-collectors-snmptrap-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/snmptrap + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-collectors-snmptrap' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-snmptrap-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 841395e56..0056c59ea 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -3,7 +3,6 @@ name: dcaegen2-collectors-ves project-name: 'dcaegen2-collectors-ves' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-collectors-ves-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-collectors-ves-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/ves + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-collectors-ves' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-ves-settings' diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 6ffa6b44f..648643e4b 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -3,7 +3,6 @@ name: dcaegen2-deployments project-name: 'dcaegen2-deployments' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,13 @@ archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' build-timeout: 180 + +- project: + name: dcaegen2-deployments-clm + jobs: + - gerrit-maven-clm + build-node: ubuntu1604-docker-8c-8g + project: dcaegen2/deployments + project-name: 'dcaegen2-deployments' + branch: 'master' + mvn-settings: 'dcaegen2-deployments-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index d4596635e..c76e65ab4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-blueprints project-name: 'dcaegen2-platform-blueprints' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,3 +20,13 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-blueprints-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/blueprints + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-blueprints' + branch: 'master' + mvn-settings: 'dcaegen2-platform-blueprints-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index c7cf8db9e..180195fb2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-cdapbroker project-name: 'dcaegen2-platform-cdapbroker' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,3 +20,13 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-cdapbroker-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/cdapbroker + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-cdapbroker' + branch: 'master' + mvn-settings: 'dcaegen2-platform-cdapbroker-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 089e7b13d..8491afbc8 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-cli project-name: 'dcaegen2-platform-cli' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-platform-cli-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-cli-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/cli + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-cli' + branch: 'master' + mvn-settings: 'dcaegen2-platform-cli-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index c84ce106b..0bd986eee 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-configbinding project-name: 'dcaegen2-platform-configbinding' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-platform-configbinding-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-configbinding-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/configbinding + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-configbinding' + branch: 'master' + mvn-settings: 'dcaegen2-platform-configbinding-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index f5dcd9dae..798fbc520 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-deployment-handler project-name: 'dcaegen2-platform-deployment-handler' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,3 +20,13 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-deployment-handler-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/deployment-handler + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-deployment-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-deployment-handler-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index bc4855538..0c9582447 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-inventory-api project-name: 'dcaegen2-platform-inventory-api' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -39,3 +38,13 @@ mvn-settings: 'dcaegen2-platform-inventory-api-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-inventory-api-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/inventory-api + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-inventory-api' + branch: 'master' + mvn-settings: 'dcaegen2-platform-inventory-api-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index a68b8c787..007629915 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-plugins project-name: 'dcaegen2-platform-plugins' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-platform-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-plugins-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/plugins + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-plugins' + branch: 'master' + mvn-settings: 'dcaegen2-platform-plugins-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 88cfedf76..024d41c4f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-policy-handler project-name: 'dcaegen2-platform-policy-handler' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-platform-policy-handler-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-policy-handler-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/policy-handler + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-policy-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-policy-handler-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 7c66bfdc8..69d8c9527 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-servicechange-handler project-name: 'dcaegen2-platform-servicechange-handler' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,3 +25,13 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-servicechange-handler-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/servicechange-handler + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-servicechange-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 017f6add0..57c0bc79e 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -3,7 +3,6 @@ name: dcaegen2-services-heartbeat project-name: 'dcaegen2-services-heartbeat' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-services-heartbeat-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-heartbeat-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/services/heartbeat + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-heartbeat' + branch: 'master' + mvn-settings: 'dcaegen2-services-heartbeat-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index b3e718422..511d93286 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -3,7 +3,6 @@ name: dcaegen2-services-mapper project-name: 'dcaegen2-services-mapper' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -35,3 +34,13 @@ mvn-settings: 'dcaegen2-services-mapper-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-mapper-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/services/mapper + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-mapper' + branch: 'master' + mvn-settings: 'dcaegen2-services-mapper-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index d15170137..9fdc9f957 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -3,7 +3,6 @@ name: dcaegen2-services-prh project-name: 'dcaegen2-services-prh' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -31,3 +30,13 @@ mvn-settings: 'dcaegen2-services-prh-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-prh-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/services/prh + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-prh' + branch: 'master' + mvn-settings: 'dcaegen2-services-prh-settings' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index f4f22d61c..9b6cb6449 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -5,7 +5,6 @@ python-version: python3 jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,3 +35,13 @@ mvn-settings: 'dcaegen2-utils-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-utils-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/utils + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-utils' + branch: 'master' + mvn-settings: 'dcaegen2-utils-settings' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 0341dbf94..ce552c073 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -3,7 +3,6 @@ name: dcaegen2 project-name: 'dcaegen2' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,12 @@ deployAtEnd=true files: '**' archive-artifacts: '' + +- project: + name: dcaegen2-clm + jobs: + - gerrit-maven-clm + project: 'dcaegen2' + project-name: 'dcaegen2' + branch: 'master' + mvn-settings: 'dcaegen2-settings' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 2af0e8d96..21077e660 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -4,7 +4,6 @@ name: dmaap-buscontroller project-name: 'dmaap-buscontroller' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,3 +28,12 @@ # removed sonar job from this template because this repo only builds a docker container # and the 0% coverage report from Sonar was causing repeated escalations. + +- project: + name: dmaap-buscontroller-clm + jobs: + - gerrit-maven-clm + project: dmaap/buscontroller + project-name: 'dmaap-buscontroller' + branch: 'master' + mvn-settings: 'dmaap-buscontroller-settings' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 3f94599f3..516d7eb38 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -2,7 +2,6 @@ name: dmaap-datarouter project-name: 'dmaap-datarouter' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -37,3 +36,11 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: dmaap-datarouter-clm + jobs: + - gerrit-maven-clm + project: dmaap/datarouter + project-name: 'dmaap-datarouter' + branch: 'master' + mvn-settings: 'dmaap-datarouter-settings' diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index e52b09f0c..d4fb4a1fa 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -3,7 +3,6 @@ name: dmaap-dbcapi project-name: 'dmaap-dbcapi' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -32,3 +31,12 @@ mvn-settings: 'dmaap-dbcapi-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dmaap-dbcapi-clm + jobs: + - gerrit-maven-clm + project: dmaap/dbcapi + project-name: 'dmaap-dbcapi' + branch: 'master' + mvn-settings: 'dmaap-dbcapi-settings' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 7efe1ef16..85ff59f84 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -3,7 +3,6 @@ name: dmaap-messagerouter-dmaapclient project-name: 'dmaap-messagerouter-dmaapclient' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,3 +26,12 @@ mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dmaap-messagerouter-dmaapclient-clm + jobs: + - gerrit-maven-clm + project: dmaap/messagerouter/dmaapclient + project-name: 'dmaap-messagerouter-dmaapclient' + branch: 'master' + mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 18d9d1cdc..ff5847346 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -4,7 +4,6 @@ name: dmaap-messagerouter-docker project-name: 'dmaap-messagerouter-docker' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-docker-version-java-daily': mvn-params: '-Dmaven.test.skip=true' - '{project-name}-{stream}-docker-java-daily': @@ -19,3 +18,13 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' build-node: ubuntu1604-docker-8c-8g + +- project: + name: dmaap-messagerouter-docker-clm + jobs: + - gerrit-maven-clm + project: dmaap/messagerouter/messageservice + project-name: 'dmaap-messagerouter-docker' + build-node: ubuntu1604-docker-8c-8g + branch: 'master' + mvn-settings: 'dmaap-messagerouter-messageservice-settings' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 914e994ad..1ff349c2c 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -3,7 +3,6 @@ name: dmaap-messagerouter-messageservice project-name: 'dmaap-messagerouter-messageservice' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,3 +26,12 @@ mvn-settings: 'dmaap-messagerouter-messageservice-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dmaap-messagerouter-messageservice-clm + jobs: + - gerrit-maven-clm + project: dmaap/messagerouter/messageservice + project-name: 'dmaap-messagerouter-messageservice' + branch: 'master' + mvn-settings: 'dmaap-messagerouter-messageservice-settings' diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 1f888b114..3ec04eb73 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -3,7 +3,6 @@ name: dmaap-messagerouter-mirroragent project-name: 'dmaap-messagerouter-mirroragent' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,3 +26,12 @@ mvn-settings: 'dmaap-messagerouter-mirroragent-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dmaap-messagerouter-mirroragent-clm + jobs: + - gerrit-maven-clm + project: dmaap/messagerouter/mirroragent + project-name: 'dmaap-messagerouter-mirroragent' + branch: 'master' + mvn-settings: 'dmaap-messagerouter-mirroragent-settings' diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 388ecfbb1..fdd472dde 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -3,7 +3,6 @@ name: dmaap-messagerouter-msgrtr project-name: 'dmaap-messagerouter-msgrtr' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,3 +26,12 @@ mvn-settings: 'dmaap-messagerouter-msgrtr-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dmaap-messagerouter-msgrtr-clm + jobs: + - gerrit-maven-clm + project: dmaap/messagerouter/msgrtr + project-name: 'dmaap-messagerouter-msgrtr' + branch: 'master' + mvn-settings: 'dmaap-messagerouter-msgrtr-settings' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index f6b05b5dc..b160f2a1f 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -3,7 +3,6 @@ name: externalapi-nbi project-name: 'externalapi-nbi' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,6 +21,15 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: externalapi-nbi-clm + jobs: + - gerrit-maven-clm + project: 'externalapi/nbi' + project-name: 'externalapi-nbi' + branch: 'master' + mvn-settings: 'externalapi-nbi-settings' + - project: name: externalapi-nbi-sonar jobs: diff --git a/jjb/global-jjb b/jjb/global-jjb deleted file mode 160000 index 75cd5909d..000000000 --- a/jjb/global-jjb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 75cd5909da184179c77a55d1909f7159d9eea34b diff --git a/jjb/global-jjb/jenkins-admin b/jjb/global-jjb/jenkins-admin new file mode 120000 index 000000000..8e7fe05cc --- /dev/null +++ b/jjb/global-jjb/jenkins-admin @@ -0,0 +1 @@ +../../global-jjb/jenkins-admin \ No newline at end of file diff --git a/jjb/global-jjb/jenkins-init-scripts b/jjb/global-jjb/jenkins-init-scripts new file mode 120000 index 000000000..c7c6a9553 --- /dev/null +++ b/jjb/global-jjb/jenkins-init-scripts @@ -0,0 +1 @@ +../../global-jjb/jenkins-init-scripts \ No newline at end of file diff --git a/jjb/global-jjb/jjb b/jjb/global-jjb/jjb new file mode 120000 index 000000000..23c884f04 --- /dev/null +++ b/jjb/global-jjb/jjb @@ -0,0 +1 @@ +../../global-jjb/jjb \ No newline at end of file diff --git a/jjb/global-jjb/shell b/jjb/global-jjb/shell new file mode 120000 index 000000000..d37c43f86 --- /dev/null +++ b/jjb/global-jjb/shell @@ -0,0 +1 @@ +../../global-jjb/shell \ No newline at end of file diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index d32e53d7b..b7a56afb1 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -469,7 +469,7 @@ fail: true - wrapper: - name: golang + name: golang110 wrappers: - raw: xml: | @@ -477,6 +477,15 @@ Golang 1.10 +- wrapper: + name: golang111 + wrappers: + - raw: + xml: | + + Golang 1.11 + + - wrapper: # This wrapper is required for all jobs as it configures the wrappers # needed by the eCOMP infra. diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index 69aadc83f..9f9bdf9f1 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -44,6 +44,7 @@ files: '**' builders: + - lf-infra-pre-build - shell: '{script}' publishers: @@ -93,6 +94,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index 8d1c40db8..3052dc2db 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -100,6 +100,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -140,6 +141,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -185,6 +187,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -227,6 +230,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -277,6 +281,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -335,6 +340,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -379,6 +385,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -416,6 +423,7 @@ <<: *docker_merge_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -461,6 +469,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -499,6 +508,7 @@ <<: *docker_verify_boiler_plate builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -549,6 +559,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -607,6 +618,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -662,6 +674,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -712,6 +725,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - lf-infra-docker-login: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index a3182cc5c..ba2f74e2e 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -5,11 +5,16 @@ # The purpose of this job template is to run: # 1. make build # + # golangver can be set to golang110 or golang111 + # depending on what version is needed by the project + # default is golang110 + # # Required Variables: # branch: git branch (eg. stable/lithium or master) name: '{project-name}-{stream}-verify-golang' path: '$WORKSPACE' + golangver: 'golang110' project-type: freestyle concurrent: true @@ -33,7 +38,7 @@ submodule-recursive: '{submodule-recursive}' wrappers: - - golang + - '{golangver}' - infra-wrappers: build-timeout: '{build-timeout}' @@ -45,6 +50,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -63,11 +69,16 @@ # The purpose of this job template is to run: # 1. make deploy # + # golangver can be set to golang110 or golang111 + # depending on what version is needed by the project + # default is golang110 + # # Required Variables: # branch: git branch (eg. stable/lithium or master) name: '{project-name}-{stream}-merge-golang' path: $WORKSPACE + golangver: 'golang110' project-type: freestyle node: '{build-node}' @@ -92,7 +103,7 @@ submodule-recursive: '{submodule-recursive}' wrappers: - - golang + - '{golangver}' - infra-wrappers: build-timeout: '{build-timeout}' @@ -104,6 +115,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -119,12 +131,17 @@ - job-template: # Job template for building & pushing docker images # + # golangver can be set to golang110 or golang111 + # depending on what version is needed by the project + # default is golang110 + # # The purpose of this job template is to run: # 1. login to the docker registry # 2. run a specified shell builder # name: '{project-name}-{stream}-docker-golang-shell-daily' + golangver: 'golang110' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' disabled: false @@ -146,7 +163,7 @@ submodule-recursive: '{submodule-recursive}' wrappers: - - golang + - '{golangver}' - infra-wrappers: build-timeout: '{build-timeout}' @@ -159,6 +176,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -169,4 +187,4 @@ publishers: - infra-shiplogs: - maven-version: '{maven-version}' \ No newline at end of file + maven-version: '{maven-version}' diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 79a00778a..664d14ea3 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -67,6 +67,7 @@ files: '{files}' builders: + - lf-infra-pre-build - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' @@ -90,6 +91,7 @@ files: '{files}' builders: + - lf-infra-pre-build - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' @@ -124,6 +126,7 @@ comment-contains-value: '^stage-helm$' builders: + - lf-infra-pre-build - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' @@ -145,6 +148,7 @@ disabled: true builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -157,6 +161,7 @@ disabled: true builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -180,6 +185,7 @@ choosing-strategy: default builders: + - lf-infra-pre-build - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 8f17a257f..61da2d5af 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -49,6 +49,7 @@ files: '{obj:pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -150,6 +151,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -217,6 +219,7 @@ project: '{project}' branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -293,6 +296,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -367,6 +371,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -444,6 +449,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -517,6 +523,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -594,6 +601,7 @@ files: '{pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -640,6 +648,7 @@ name: '{project-name}-{stream}-merge-profile-java' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -724,7 +733,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -809,6 +818,7 @@ project: '{project}' branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -883,7 +893,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -951,7 +961,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1021,7 +1031,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1099,7 +1109,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1180,7 +1190,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1278,7 +1288,7 @@ branch: '{branch}' builders: - + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -1330,6 +1340,7 @@ build-timeout: 120 builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 80ae84bb7..b30af0ea5 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -53,6 +53,7 @@ files: '{pattern}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -137,6 +138,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index 9264bc9e5..fcbf745fc 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -47,6 +47,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -122,6 +123,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -193,6 +195,7 @@ files: '**' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -260,6 +263,7 @@ branch: '{branch}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -315,6 +319,7 @@ build-timeout: '{build-timeout}' builders: + - lf-infra-pre-build - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 9d7f34be1..559f1d577 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -3,7 +3,6 @@ name: holmes-common project-name: 'holmes-common' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,3 +28,12 @@ mvn-settings: 'holmes-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: holmes-common-clm + jobs: + - gerrit-maven-clm + project: holmes/common + project-name: 'holmes-common' + branch: 'master' + mvn-settings: 'holmes-common-settings' diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml index 8a014be81..79b4fe663 100644 --- a/jjb/holmes/holmes-dsa.yaml +++ b/jjb/holmes/holmes-dsa.yaml @@ -3,7 +3,6 @@ name: holmes-dsa project-name: 'holmes-dsa' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,12 @@ mvn-settings: 'holmes-dsa-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: holmes-dsa-clm + jobs: + - gerrit-maven-clm + project: holmes/dsa + project-name: 'holmes-dsa' + branch: 'master' + mvn-settings: 'holmes-dsa-settings' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index cd4e71c4e..77888cc15 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -3,7 +3,6 @@ name: holmes-engine-management project-name: 'holmes-engine-management' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,12 @@ mvn-settings: 'holmes-engine-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: holmes-engine-management-clm + jobs: + - gerrit-maven-clm + project: holmes/engine-management + project-name: 'holmes-engine-management' + branch: 'master' + mvn-settings: 'holmes-engine-management-settings' diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index ee7815856..42d14daca 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -3,7 +3,6 @@ name: holmes-rule-management project-name: 'holmes-rule-management' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,12 @@ mvn-settings: 'holmes-rule-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: holmes-rule-management-clm + jobs: + - gerrit-maven-clm + project: holmes/rule-management + project-name: 'holmes-rule-management' + branch: 'master' + mvn-settings: 'holmes-rule-management-settings' diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index e97f0abd7..65f166441 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -3,8 +3,6 @@ name: integration project-name: 'integration' jobs: - - gerrit-maven-clm: - mvn-params: '-f version-manifest/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -20,3 +18,13 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: integration-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f version-manifest/pom.xml' + project: integration + project-name: 'integration' + branch: 'master' + mvn-settings: 'integration-settings' diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml index 6c4f3be29..6720c9565 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml @@ -3,7 +3,6 @@ name: logging-analytics-pomba-pomba-aai-context-builder project-name: logging-analytics-pomba-pomba-aai-context-builder jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -41,3 +40,12 @@ - gerrit-info-yaml-verify project: 'logging-analytics/pomba/pomba-aai-context-builder' branch: 'master' + +- project: + name: logging-analytics-pomba-pomba-aai-context-builder-clm + jobs: + - gerrit-maven-clm + project: logging-analytics/pomba/pomba-aai-context-builder + project-name: logging-analytics-pomba-pomba-aai-context-builder + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml index dc7979b77..8b84dc127 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml @@ -3,7 +3,6 @@ name: logging-analytics-pomba-pomba-audit-common project-name: logging-analytics-pomba-pomba-audit-common jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -35,3 +34,12 @@ - gerrit-info-yaml-verify project: 'logging-analytics/pomba/pomba-audit-common' branch: 'master' + +- project: + name: logging-analytics-pomba-pomba-audit-common-clm + jobs: + - gerrit-maven-clm + project: logging-analytics/pomba/pomba-audit-common + project-name: logging-analytics-pomba-pomba-audit-common + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-audit-common-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml index 18f186952..e398f8c63 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml @@ -3,7 +3,6 @@ name: logging-analytics-pomba-pomba-context-aggregator project-name: logging-analytics-pomba-pomba-context-aggregator jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -42,3 +41,12 @@ - gerrit-info-yaml-verify project: 'logging-analytics/pomba/pomba-context-aggregator' branch: 'master' + +- project: + name: logging-analytics-pomba-pomba-context-aggregator-clm + jobs: + - gerrit-maven-clm + project: logging-analytics/pomba/pomba-context-aggregator + project-name: logging-analytics-pomba-pomba-context-aggregator + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml index ae10c44e4..8bf521ceb 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml @@ -3,7 +3,6 @@ name: logging-analytics-pomba-pomba-network-discovery-context-builder project-name: logging-analytics-pomba-pomba-network-discovery-context-builder jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -41,3 +40,12 @@ - gerrit-info-yaml-verify project: 'logging-analytics/pomba/pomba-network-discovery-context-builder' branch: 'master' + +- project: + name: logging-analytics-pomba-pomba-network-discovery-context-builder-clm + jobs: + - gerrit-maven-clm + project: logging-analytics/pomba/pomba-network-discovery-context-builder + project-name: logging-analytics-pomba-pomba-network-discovery-context-builder + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml index 96d60ebc3..1fb2619f8 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml @@ -3,7 +3,6 @@ name: logging-analytics-pomba-pomba-sdc-context-builder project-name: logging-analytics-pomba-pomba-sdc-context-builder jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -41,3 +40,12 @@ - gerrit-info-yaml-verify project: 'logging-analytics/pomba/pomba-sdc-context-builder' branch: 'master' + +- project: + name: logging-analytics-pomba-pomba-sdc-context-builder-clm + jobs: + - gerrit-maven-clm + project: logging-analytics/pomba/pomba-sdc-context-builder + project-name: logging-analytics-pomba-pomba-sdc-context-builder + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml new file mode 100644 index 000000000..230a510f6 --- /dev/null +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml @@ -0,0 +1,49 @@ +--- +- project: + name: logging-analytics-pomba-pomba-sdnc-context-builder + project-name: logging-analytics-pomba-pomba-sdnc-context-builder + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + project: logging-analytics/pomba/pomba-sdnc-context-builder + stream: + - 'master': + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-builder-4c-4g + project: logging-analytics/pomba/pomba-sdnc-context-builder + project-name: logging-analytics-pomba-pomba-sdnc-context-builder + branch: master + mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: logging-analytics-pomba-pomba-sdnc-context-builder-info + project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder' + jobs: + - gerrit-info-yaml-verify + project: 'logging-analytics/pomba/pomba-sdnc-context-builder' + branch: 'master' + +- project: + name: logging-analytics-pomba-pomba-sdnc-context-builder-clm + jobs: + - gerrit-maven-clm + project: logging-analytics/pomba/pomba-sdnc-context-builder + project-name: logging-analytics-pomba-pomba-sdnc-context-builder + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 20d86181b..80386843e 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -3,7 +3,6 @@ name: logging-analytics project-name: 'logging-analytics' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -81,3 +80,12 @@ - gerrit-info-yaml-verify project: 'logging-analytics' branch: 'master' + +- project: + name: logging-analytics-clm + jobs: + - gerrit-maven-clm + project: logging-analytics + project-name: 'logging-analytics' + branch: 'master' + mvn-settings: 'logging-analytics-settings' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 798ee14de..03bc2d9bb 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -14,8 +14,6 @@ pattern: 'javatoscachecker/**' pom: 'javatoscachecker/pom.xml' jobs: - - gerrit-maven-clm: - mvn-params: '-f javatoscachecker/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -42,3 +40,14 @@ mvn-settings: 'modeling-toscaparsers-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: modeling-toscaparsers-javatoscachecker-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f javatoscachecker/pom.xml' + project: modeling/toscaparsers + project-name: 'modeling-toscaparsers-javatoscachecker' + build-node: ubuntu1604-docker-8c-8g + branch: 'master' + mvn-settings: 'modeling-toscaparsers-settings' diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 25a72c72e..e10e24d6e 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -15,8 +15,6 @@ pom: 'nfvparser/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - - gerrit-maven-clm: - mvn-params: '-f nfvparser/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -34,3 +32,13 @@ mvn-settings: 'modeling-toscaparsers-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: modeling-toscaparsers-nfvparser-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f nfvparser/pom.xml' + project: modeling/toscaparsers + project-name: 'modeling-toscaparsers-nfvparser' + branch: 'master' + mvn-settings: 'modeling-toscaparsers-settings' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index e85545381..43a8a0861 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -3,7 +3,6 @@ name: msb-apigateway project-name: 'msb-apigateway' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,12 @@ mvn-settings: 'msb-apigateway-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: msb-apigateway-clm + jobs: + - gerrit-maven-clm + project: msb/apigateway + project-name: 'msb-apigateway' + branch: 'master' + mvn-settings: 'msb-apigateway-settings' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index afbd9bdf6..3ffdc229e 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -3,7 +3,6 @@ name: msb-discovery project-name: 'msb-discovery' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,12 @@ mvn-settings: 'msb-discovery-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: msb-discovery-clm + jobs: + - gerrit-maven-clm + project: msb/discovery + project-name: 'msb-discovery' + branch: 'master' + mvn-settings: 'msb-discovery-settings' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index ab73827be..302936251 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -3,7 +3,6 @@ name: msb-java-sdk project-name: 'msb-java-sdk' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,3 +27,12 @@ mvn-settings: 'msb-java-sdk-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: msb-java-sdk-clm + jobs: + - gerrit-maven-clm + project: msb/java-sdk + project-name: 'msb-java-sdk' + branch: 'master' + mvn-settings: 'msb-java-sdk-settings' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 53b4e1414..8533676d2 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -3,7 +3,6 @@ name: msb-swagger-sdk project-name: 'msb-swagger-sdk' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,3 +27,12 @@ mvn-settings: 'msb-swagger-sdk-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: msb-swagger-sdk-clm + jobs: + - gerrit-maven-clm + project: msb/swagger-sdk + project-name: 'msb-swagger-sdk' + branch: 'master' + mvn-settings: 'msb-swagger-sdk-settings' diff --git a/jjb/multicloud/build-multicloud-azure-docker-image.sh b/jjb/multicloud/build-multicloud-azure-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/build-multicloud-framework-docker-image.sh b/jjb/multicloud/build-multicloud-framework-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/build-multicloud-k8s-docker-image.sh b/jjb/multicloud/build-multicloud-k8s-docker-image.sh new file mode 100755 index 000000000..af19340c0 --- /dev/null +++ b/jjb/multicloud/build-multicloud-k8s-docker-image.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 Intel Corporation +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +set -o xtrace + +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' +cd ./deployments +./build.sh diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/portal-sdk/portal-sdk-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml similarity index 54% rename from jjb/portal-sdk/portal-sdk-csit.yaml rename to jjb/multicloud/multicloud-azure-csit.yaml index c5667e63d..10946318a 100644 --- a/jjb/portal-sdk/portal-sdk-csit.yaml +++ b/jjb/multicloud/multicloud-azure-csit.yaml @@ -1,12 +1,13 @@ +--- - project: - name: portal-sdk-csit + name: multicloud-azure-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'portal-sdk' + project-name: 'multicloud-azure' stream: 'master' functionality: - - 'testsuite': - trigger_jobs: 'portal-docker-{stream}-merge-docker-script' + - 'functionality1': + trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index f9e94f92b..b4590be97 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -12,7 +12,6 @@ pom: 'azure/pom.xml' pattern: 'azure/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' @@ -39,3 +38,12 @@ mvn-settings: 'multicloud-azure-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-azure-java-clm + jobs: + - gerrit-maven-clm + project: multicloud/azure + project-name: 'multicloud-azure' + branch: 'master' + mvn-settings: 'multicloud-azure-settings' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 8f20092cd..8da6ac993 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -12,7 +12,6 @@ pom: 'multivimbroker/pom.xml' pattern: 'multivimbroker/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' @@ -39,3 +38,12 @@ mvn-settings: 'multicloud-framework-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-framework-java-clm + jobs: + - gerrit-maven-clm + project: multicloud/framework + project-name: 'multicloud-framework' + branch: 'master' + mvn-settings: 'multicloud-framework-settings' diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 94595ed92..00ac9f7c6 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -7,6 +7,9 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-golang' - '{project-name}-{stream}-merge-golang' + - '{project-name}-{stream}-docker-golang-shell-daily': + script: + !include-raw-escape: 'build-multicloud-k8s-docker-image.sh' project: 'multicloud/k8s' subproject: - validation-scripts: diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 00f6d025f..0743a2425 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -12,7 +12,6 @@ pom: 'vio/pom.xml' pattern: 'vio/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' @@ -39,3 +38,12 @@ mvn-settings: 'multicloud-openstack-vmware-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-openstack-vmware-java-clm + jobs: + - gerrit-maven-clm + project: multicloud/openstack/vmware + project-name: 'multicloud-openstack-vmware' + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index d6cc74d47..0ff1cc55f 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -37,7 +37,6 @@ pattern: 'windriver/**' pom: 'windriver/pom.xml' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' @@ -106,3 +105,13 @@ mvn-settings: 'multicloud-openstack-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-openstack-clm + jobs: + - gerrit-maven-clm + project: multicloud/openstack + project-name: 'multicloud-openstack' + build-node: ubuntu1604-memcached-4c-4g + branch: 'master' + mvn-settings: 'multicloud-openstack-settings' diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index 457042a6c..6f83f0fd3 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -7,8 +7,6 @@ pom: 'jar/pom.xml' pattern: 'jar/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f jar/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' project: 'music' @@ -24,3 +22,13 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: music-jar-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f jar/pom.xml' + project: music + project-name: 'music-jar' + branch: 'master' + mvn-settings: 'music-settings' diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml index 3e2031a17..1e48b35ae 100644 --- a/jjb/music/music-prom.yaml +++ b/jjb/music/music-prom.yaml @@ -3,7 +3,6 @@ name: music-prom project-name: 'music-prom' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,3 +19,12 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: music-prom-clm + jobs: + - gerrit-maven-clm + project: music/prom + project-name: 'music-prom' + branch: 'master' + mvn-settings: 'music-prom-settings' diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml index aa52bec61..bf33832d9 100644 --- a/jjb/music/music-trigger.yaml +++ b/jjb/music/music-trigger.yaml @@ -7,8 +7,6 @@ pom: 'musictrigger/pom.xml' pattern: 'musictrigger/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f musictrigger/pom.xml assembly:single' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' project: 'music' @@ -20,3 +18,13 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: music-trigger-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f musictrigger/pom.xml assembly:single' + project: music + project-name: 'music-trigger' + branch: 'master' + mvn-settings: 'music-settings' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 2fe2702e5..43fe66524 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -3,7 +3,6 @@ name: music project-name: 'music' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -35,3 +34,12 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: music-clm + jobs: + - gerrit-maven-clm + project: music + project-name: 'music' + branch: 'master' + mvn-settings: 'music-settings' diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 725c67efc..060ffb731 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -3,7 +3,6 @@ name: oom-registrator project-name: 'oom-registrator' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,3 +19,12 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: oom-registrator-clm + jobs: + - gerrit-maven-clm + project: oom/registrator + project-name: 'oom-registrator' + branch: 'master' + mvn-settings: 'oom-registrator-settings' diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 4d15713d4..f2be369c0 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -3,7 +3,6 @@ name: oparent project-name: 'oparent' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -15,3 +14,12 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: oparent-clm + jobs: + - gerrit-maven-clm + project: oparent + project-name: 'oparent' + branch: 'master' + mvn-settings: 'oparent-settings' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index e6ef1f980..77d797a71 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -1,64 +1,60 @@ ---- -- project: - name: optf-cmso - project-name: 'optf-cmso' - project: 'optf/cmso' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-cmso-settings' - subproject: - - 'cmso': - path: '.' - pattern: '**' - pom: 'pom.xml' - jobs: - - gerrit-maven-clm - - '{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-builder-4c-4g' - -- project: - name: optf-cmso-docker - project-name: 'optf-cmso' - project: 'optf/cmso' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-cmso-settings' - subproject: - - 'cmso': - path: '.' - pattern: '**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-cmso-docker-image.sh' - build-node: queue-docker-4c-4g - - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-cmso-docker-image.sh' - build-node: queue-docker-4c-4g - -- project: - name: optf-cmso-sonar - jobs: - - gerrit-maven-sonar - cron: 'H 11 * * *' - build-node: ubuntu1604-builder-4c-4g - project: 'optf/cmso' - project-name: 'optf-cmso' - branch: 'master' - mvn-settings: 'optf-cmso-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +--- + +- project: + name: optf-cmso + project-name: 'optf-cmso' + jobs: + - '{project-name}-{stream}-verify-java-checkstyle': + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + - '{project-name}-{stream}-merge-properties-java': + mvn_properties: + - docker.pull.registry=nexus3.onap.org:10001 + - docker.push.registry=nexus3.onap.org:10003 + - '{project-name}-{stream}-release-java-daily-checkstyle': + setVersion: 'DoSetVersion' + mvn_properties: + - docker.pull.registry=nexus3.onap.org:10001 + - '{project-name}-{stream}-docker-java-properties-daily': + setVersion: 'DoSetVersion' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + maven-properties: | + cmso.registry=$ + + build-node: ubuntu1604-docker-8c-8g + project: 'optf/cmso' + stream: + - 'master': + branch: 'master' + mvn-settings: 'optf-cmso-settings' + subproject: + - 'cmso': + path: '.' + pattern: '**' + pom: 'pom.xml' + +- project: + name: optf-cmso-sonar + jobs: + - gerrit-maven-sonar: + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + cron: 'H 11 * * *' + build-node: ubuntu1604-docker-8c-8g + project: 'optf/cmso' + project-name: 'optf-cmso' + branch: 'master' + mvn-settings: 'optf-cmso-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: optf-cmso-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + project: optf/cmso + project-name: 'optf-cmso' + build-node: ubuntu1604-docker-8c-8g + branch: 'master' + mvn-settings: 'optf-cmso-settings' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 6860822ff..945e3d208 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -15,7 +15,6 @@ pattern: 'conductor/**' pom: 'pom.xml' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-verify-java' @@ -68,3 +67,12 @@ mvn-settings: 'optf-has-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: optf-has-clm + jobs: + - gerrit-maven-clm + project: optf/has + project-name: 'optf-has' + branch: 'master' + mvn-settings: 'optf-has-settings' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 8cc048db4..6c6e2fc8b 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -15,7 +15,6 @@ pattern: '**' pom: 'pom.xml' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' @@ -67,3 +66,12 @@ mvn-settings: 'optf-osdf-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: optf-osdf-clm + jobs: + - gerrit-maven-clm + project: optf/osdf + project-name: 'optf-osdf' + branch: 'master' + mvn-settings: 'optf-osdf-settings' diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 7b490cb2a..788f0e7d1 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -3,7 +3,6 @@ name: policy-apex-pdp project-name: 'policy-apex-pdp' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B @@ -39,3 +38,12 @@ mvn-settings: 'policy-apex-pdp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-apex-pdp-clm + jobs: + - gerrit-maven-clm + project: policy/apex-pdp + project-name: 'policy-apex-pdp' + branch: 'master' + mvn-settings: 'policy-apex-pdp-settings' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 29977b9fa..e8b565890 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -3,7 +3,6 @@ name: policy-api project-name: 'policy-api' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-api-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-api-clm + jobs: + - gerrit-maven-clm + project: policy/api + project-name: 'policy-api' + branch: 'master' + mvn-settings: 'policy-api-settings' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 8607d28cc..6613576dd 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -3,7 +3,6 @@ name: policy-common project-name: 'policy-common' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': @@ -30,3 +29,12 @@ mvn-settings: 'policy-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-common-clm + jobs: + - gerrit-maven-clm + project: policy/common + project-name: 'policy-common' + branch: 'master' + mvn-settings: 'policy-common-settings' diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml index 1506f6c48..4f457eb1f 100644 --- a/jjb/policy/policy-core.yaml +++ b/jjb/policy/policy-core.yaml @@ -3,7 +3,6 @@ name: policy-core project-name: 'policy-core' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-core-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-core-clm + jobs: + - gerrit-maven-clm + project: policy/core + project-name: 'policy-core' + branch: 'master' + mvn-settings: 'policy-core-settings' diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index bc5bcc672..53fc51083 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -3,7 +3,6 @@ name: policy-distribution project-name: 'policy-distribution' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' @@ -37,3 +36,12 @@ mvn-settings: 'policy-distribution-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-distribution-clm + jobs: + - gerrit-maven-clm + project: policy/distribution + project-name: 'policy-distribution' + branch: 'master' + mvn-settings: 'policy-distribution-settings' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 04f5ef392..31f9ba9e1 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -3,7 +3,6 @@ name: policy-drools-applications project-name: 'policy-drools-applications' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': @@ -30,3 +29,12 @@ mvn-settings: 'policy-drools-applications-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-drools-applications-clm + jobs: + - gerrit-maven-clm + project: policy/drools-applications + project-name: 'policy-drools-applications' + branch: 'master' + mvn-settings: 'policy-drools-applications-settings' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index cb125b02c..717eedc8f 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -3,8 +3,6 @@ name: policy-drools-pdp project-name: 'policy-drools-pdp' jobs: - - gerrit-maven-clm: - mvn-params: '-DskipTests' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B @@ -40,3 +38,13 @@ mvn-settings: 'policy-drools-pdp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-drools-pdp-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-DskipTests' + project: policy/drools-pdp + project-name: 'policy-drools-pdp' + branch: 'master' + mvn-settings: 'policy-drools-pdp-settings' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index f116f7bf5..0dc51b12f 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -3,8 +3,6 @@ name: policy-engine project-name: 'policy-engine' jobs: - - gerrit-maven-clm: - build-timeout: 30 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B @@ -40,3 +38,13 @@ mvn-settings: 'policy-engine-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-engine-clm + jobs: + - gerrit-maven-clm: + build-timeout: 30 + project: policy/engine + project-name: 'policy-engine' + branch: 'master' + mvn-settings: 'policy-engine-settings' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 43a35c56d..40b9dc1f4 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -3,7 +3,6 @@ name: policy-gui project-name: 'policy-gui' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-gui-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-gui-clm + jobs: + - gerrit-maven-clm + project: policy/gui + project-name: 'policy-gui' + branch: 'master' + mvn-settings: 'policy-gui-settings' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 60d4881a7..e8513be55 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -3,7 +3,6 @@ name: policy-models project-name: 'policy-models' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-models-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-models-clm + jobs: + - gerrit-maven-clm + project: policy/models + project-name: 'policy-models' + branch: 'master' + mvn-settings: 'policy-models-settings' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index ad789b25a..13f2701e6 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -3,7 +3,6 @@ name: policy-pap project-name: 'policy-pap' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-pap-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-pap-clm + jobs: + - gerrit-maven-clm + project: policy/pap + project-name: 'policy-pap' + branch: 'master' + mvn-settings: 'policy-pap-settings' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 13e97a68e..34f357813 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -3,7 +3,6 @@ name: policy-parent project-name: 'policy-parent' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,3 +15,12 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: policy-parent-clm + jobs: + - gerrit-maven-clm + project: policy/parent + project-name: 'policy-parent' + branch: 'master' + mvn-settings: 'policy-parent-settings' diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml index f124bb4c0..2d299b4d1 100644 --- a/jjb/policy/policy-pdp.yaml +++ b/jjb/policy/policy-pdp.yaml @@ -3,7 +3,6 @@ name: policy-pdp project-name: 'policy-pdp' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-pdp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-pdp-clm + jobs: + - gerrit-maven-clm + project: policy/pdp + project-name: 'policy-pdp' + branch: 'master' + mvn-settings: 'policy-pdp-settings' diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 8da603c0b..0b45026c7 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -3,7 +3,6 @@ name: policy-xacml-pdp project-name: 'policy-xacml-pdp' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,3 +27,12 @@ mvn-settings: 'policy-xacml-pdp-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-xacml-pdp-clm + jobs: + - gerrit-maven-clm + project: policy/xacml-pdp + project-name: 'policy-xacml-pdp' + branch: 'master' + mvn-settings: 'policy-xacml-pdp-settings' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index b5fab5f34..af32f0782 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -9,8 +9,6 @@ subproject-name: 'onap-sdk' jobs: - - gerrit-maven-clm: - mvn-params: '-f ecomp-sdk/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily' @@ -18,14 +16,6 @@ stream: - 'master': branch: 'master' - - 'release-2.1.0': - branch: 'release-2.1.0' - - 'release-2.1.1': - branch: 'release-2.1.1' - - 'release-2.2.0': - branch: 'release-2.2.0' - - 'release-2.3.0': - branch: 'release-2.3.0' - 'release-2.4.0': branch: 'release-2.4.0' mvn-settings: 'portal-sdk-settings' @@ -46,3 +36,13 @@ mvn-settings: 'portal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: portal-sdk-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f ecomp-sdk/pom.xml' + project: portal/sdk + project-name: 'portal-sdk' + branch: 'master' + mvn-settings: 'portal-sdk-settings' diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml deleted file mode 100644 index 697db4640..000000000 --- a/jjb/portal/portal-csit.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- project: - name: portal-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'portal' - stream: 'master' - functionality: - - 'testsuite': - trigger_jobs: 'portal-docker-{stream}-merge-docker-script' - robot-options: '' - branch: 'master' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 2e2f71370..400509d65 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -3,7 +3,6 @@ name: portal project-name: 'portal' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-release-java-daily' project: 'portal' stream: @@ -29,3 +28,12 @@ mvn-settings: 'portal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: portal-clm + jobs: + - gerrit-maven-clm + project: portal + project-name: 'portal' + branch: 'master' + mvn-settings: 'portal-settings' diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index a43ad6392..595f86392 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -3,7 +3,6 @@ name: sdc-dcae-d-ci project-name: 'sdc-dcae-d-ci' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -33,3 +32,12 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-dcae-d-ci-clm + jobs: + - gerrit-maven-clm + project: sdc/dcae-d/ci + project-name: 'sdc-dcae-d-ci' + branch: 'master' + mvn-settings: 'sdc-dcae-d-ci-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 9980935ad..5d0f4b683 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -3,7 +3,6 @@ name: sdc-dcae-d-dt-be-main project-name: 'sdc-dcae-d-dt-be-main' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -33,3 +32,12 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-dcae-d-dt-be-main-clm + jobs: + - gerrit-maven-clm + project: sdc/dcae-d/dt-be-main + project-name: 'sdc-dcae-d-dt-be-main' + branch: 'master' + mvn-settings: 'sdc-dcae-d-dt-be-main-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index a60e6dd18..0e642dfff 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -3,7 +3,6 @@ name: sdc-dcae-d-dt-be-property project-name: 'sdc-dcae-d-dt-be-property' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -29,3 +28,12 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-dcae-d-dt-be-property-clm + jobs: + - gerrit-maven-clm + project: sdc/dcae-d/dt-be-property + project-name: 'sdc-dcae-d-dt-be-property' + branch: 'master' + mvn-settings: 'sdc-dcae-d-dt-be-property-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 58d733157..5e5183d5d 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -4,7 +4,6 @@ project-name: 'sdc-dcae-d-dt' build-node: ubuntu1604-builder-4c-2g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -34,3 +33,13 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-dcae-d-dt-clm + jobs: + - gerrit-maven-clm + project: sdc/dcae-d/dt + project-name: 'sdc-dcae-d-dt' + build-node: ubuntu1604-builder-4c-2g + branch: 'master' + mvn-settings: 'sdc-dcae-d-dt-settings' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index d92bd530c..c869906b4 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -4,7 +4,6 @@ project-name: 'sdc-dcae-d-fe' build-node: ubuntu1604-builder-4c-2g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -34,3 +33,13 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-dcae-d-fe-clm + jobs: + - gerrit-maven-clm + project: sdc/dcae-d/fe + project-name: 'sdc-dcae-d-fe' + build-node: ubuntu1604-builder-4c-2g + branch: 'master' + mvn-settings: 'sdc-dcae-d-fe-settings' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 5e37e142f..2ff77ed8c 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -4,7 +4,6 @@ name: sdc-jtosca project-name: 'sdc-jtosca' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -31,3 +30,12 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-jtosca-clm + jobs: + - gerrit-maven-clm + project: sdc/jtosca + project-name: 'sdc-jtosca' + branch: 'master' + mvn-settings: 'sdc-jtosca-settings' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 27bf97f44..4bf13dc52 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -4,7 +4,6 @@ name: sdc-sdc-distribution-client project-name: 'sdc-sdc-distribution-client' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -31,3 +30,12 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-sdc-distribution-client-clm + jobs: + - gerrit-maven-clm + project: sdc/sdc-distribution-client + project-name: 'sdc-sdc-distribution-client' + branch: 'master' + mvn-settings: 'sdc-sdc-distribution-client-settings' diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index 128f02cb0..5b7d93730 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -4,7 +4,6 @@ name: sdc-sdc-titan-cassandra project-name: 'sdc-sdc-titan-cassandra' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -17,3 +16,12 @@ archive-artifacts: '' build-timeout: 60 maven-version: 'mvn35' + +- project: + name: sdc-sdc-titan-cassandra-clm + jobs: + - gerrit-maven-clm + project: sdc/sdc-titan-cassandra + project-name: 'sdc-sdc-titan-cassandra' + branch: 'master' + mvn-settings: 'sdc-sdc-titan-cassandra-settings' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 5f3c2df7e..4f0c301bc 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -4,7 +4,6 @@ name: sdc-sdc-tosca project-name: 'sdc-sdc-tosca' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -31,3 +30,12 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-sdc-tosca-clm + jobs: + - gerrit-maven-clm + project: sdc/sdc-tosca + project-name: 'sdc-sdc-tosca' + branch: 'master' + mvn-settings: 'sdc-sdc-tosca-settings' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 3d3af1dd1..e4524e7a0 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -3,7 +3,6 @@ name: sdc-sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-sdc-workflow-designer-clm + jobs: + - gerrit-maven-clm + project: sdc/sdc-workflow-designer + project-name: 'sdc-sdc-workflow-designer' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'sdc-sdc-workflow-designer-settings' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index bbe8a171e..14b106afa 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -16,9 +16,6 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - - gerrit-maven-clm: - build-timeout: 120 - mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' project: 'sdc' stream: - 'master': @@ -42,3 +39,16 @@ mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-clm + jobs: + - gerrit-maven-clm: + build-timeout: 120 + submodule-timeout: 30 + mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + project: sdc + project-name: 'sdc' + build-node: ubuntu1604-docker-8c-8g + branch: 'master' + mvn-settings: 'sdc-settings' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 21ddfb05f..2f00a9ef5 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -3,7 +3,6 @@ name: sdnc-apps project-name: 'sdnc-apps' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -40,7 +41,7 @@ name: sdnc-apps-docker project-name: 'sdnc-apps' jobs: - - 'docker-java-daily': + - 'docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' @@ -48,8 +49,20 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-apps-settings' files: '**' archive-artifacts: '' build-node: queue-docker-4c-4g + +- project: + name: sdnc-apps-clm + jobs: + - gerrit-maven-clm + project: sdnc/apps + project-name: 'sdnc-apps' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'sdnc-apps-settings' diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 12d697518..dbbfb7c17 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -5,7 +5,11 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'sdnc' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index dc82689a9..acfe8a8e2 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -3,7 +3,6 @@ name: sdnc-northbound project-name: 'sdnc-northbound' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be @@ -35,3 +36,13 @@ mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: sdnc-northbound-clm + jobs: + - gerrit-maven-clm + project: sdnc/northbound + project-name: 'sdnc-northbound' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'sdnc-northbound-settings' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 5c5a6743b..8a0433ef4 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -4,7 +4,6 @@ name: sdnc-oam project-name: 'sdnc-oam' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' @@ -21,7 +22,7 @@ name: sdnc-oam-docker project-name: 'sdnc-oam' jobs: - - 'docker-java-daily': + - 'docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' @@ -29,7 +30,19 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' build-node: queue-docker-4c-4g + +- project: + name: sdnc-oam-clm + jobs: + - gerrit-maven-clm + project: sdnc/oam + project-name: 'sdnc-oam' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'sdnc-oam-settings' diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index 288e6f4dc..b194d853a 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -5,9 +5,12 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'so' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'integration-testing': - trigger_jobs: 'so-master-docker-version-java-daily' + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' robot-options: '' - branch: 'master' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 2fa46c00c..6714fea8d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -3,7 +3,6 @@ name: so-libs project-name: 'so-libs' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -11,8 +10,8 @@ stream: - 'master': branch: 'master' - - 'Dublin_dev': - branch: 'Dublin_dev' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'so-libs-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -34,3 +33,12 @@ mvn-settings: 'so-libs-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-libs-clm + jobs: + - gerrit-maven-clm + project: so/libs + project-name: 'so-libs' + branch: 'master' + mvn-settings: 'so-libs-settings' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index a25b20bcb..1af2778b0 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -4,7 +4,6 @@ name: so project-name: 'so' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,8 +15,8 @@ stream: - 'master': branch: 'master' - - 'Dublin_dev': - branch: 'Dublin_dev' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' @@ -35,3 +34,13 @@ mvn-settings: 'so-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-clm + jobs: + - gerrit-maven-clm + project: so + project-name: 'so' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'so-settings' diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge-master.yaml index aea8385ac..5c45b5c9b 100644 --- a/jjb/testsuite/testsuite-heatbridge-master.yaml +++ b/jjb/testsuite/testsuite-heatbridge-master.yaml @@ -7,7 +7,6 @@ path: '.' pattern: '**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' project: 'testsuite/heatbridge' @@ -18,3 +17,13 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: testsuite-heatbridge-master-clm + jobs: + - gerrit-maven-clm + project: testsuite/heatbridge + project-name: 'testsuite-heatbridge' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'testsuite-heatbridge-settings' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index e469c609e..5818f80b3 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -9,7 +9,6 @@ branch: 'master' mvn-settings: 'usecase-ui-server-settings' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,13 @@ mvn-settings: 'usecase-ui-server-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: usecase-ui-server-clm + jobs: + - gerrit-maven-clm + project: usecase-ui/server + project-name: 'usecase-ui-server' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'usecase-ui-server-settings' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 894be9103..33a7814ba 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -9,7 +9,6 @@ branch: 'master' mvn-settings: 'usecase-ui-settings' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,3 +19,13 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-builder-4c-4g + +- project: + name: usecase-ui-clm + jobs: + - gerrit-maven-clm + project: usecase-ui + project-name: 'usecase-ui' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'usecase-ui-settings' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 50d8ff5be..faf9d44ab 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -13,7 +13,6 @@ pom: 'lcm/pom.xml' pattern: 'lcm/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -39,3 +38,13 @@ mvn-settings: 'vfc-gvnfm-vnflcm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-gvnfm-vnflcm-java-clm + jobs: + - gerrit-maven-clm + project: vfc/gvnfm/vnflcm + project-name: 'vfc-gvnfm-vnflcm' + build-node: centos7-redis-4c-4g + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnflcm-settings' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 817926b2d..f08054a15 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -12,7 +12,6 @@ pom: 'mgr/pom.xml' pattern: 'mgr/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -38,3 +37,13 @@ mvn-settings: 'vfc-gvnfm-vnfmgr-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-gvnfm-vnfmgr-java-clm + jobs: + - gerrit-maven-clm + project: vfc/gvnfm/vnfmgr + project-name: 'vfc-gvnfm-vnfmgr' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnfmgr-settings' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index d2dda94a3..82d31fc75 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -13,7 +13,6 @@ pom: 'res/pom.xml' pattern: 'res/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -39,3 +38,13 @@ mvn-settings: 'vfc-gvnfm-vnfres-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-gvnfm-vnfres-java-clm + jobs: + - gerrit-maven-clm + project: vfc/gvnfm/vnfres + project-name: 'vfc-gvnfm-vnfres' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnfres-settings' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 50164ff70..3587f4005 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -13,7 +13,6 @@ path: '.' pattern: '**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -39,3 +38,13 @@ mvn-settings: 'vfc-nfvo-catalog-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-catalog-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/catalog + project-name: 'vfc-nfvo-catalog' + build-node: centos7-redis-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-catalog-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 2e8b10c83..70bd630e0 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -13,7 +13,6 @@ pom: 'ems/pom.xml' pattern: 'ems/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -38,3 +37,13 @@ mvn-settings: 'vfc-nfvo-driver-ems-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-ems-java-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/driver/ems + project-name: 'vfc-nfvo-driver-ems' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-ems-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 3b097847a..f754a2c1b 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -12,7 +12,6 @@ pom: 'zte/sfc-driver/pom.xml' pattern: 'zte/sfc-driver/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -38,3 +37,13 @@ mvn-settings: 'vfc-nfvo-driver-sfc-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-sfc-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/driver/sfc + project-name: 'vfc-nfvo-driver-sfc' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-sfc-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 1dcdb3e51..86c4f7a7f 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -12,8 +12,6 @@ pom: 'huawei/pom.xml' pattern: 'huawei/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f huawei/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -34,3 +32,14 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-svnfm-huawei-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f huawei/pom.xml' + project: vfc/nfvo/driver/vnfm/svnfm + project-name: 'vfc-nfvo-driver-svnfm-huawei' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 12ffa5d60..456e38123 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -13,7 +13,6 @@ pom: 'gvnfmadapter/pom.xml' pattern: 'gvnfmadapter/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -39,3 +38,13 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-vnfm-gvnfm-java-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/driver/vnfm/gvnfm + project-name: 'vfc-nfvo-driver-vnfm-gvnfm' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index 3c3601dcb..d32067aa3 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -12,8 +12,6 @@ pom: 'nokia/vnfmdriver/pom.xml' pattern: 'nokia/vnfmdriver/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f nokia/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -34,3 +32,14 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-nokia-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f nokia/pom.xml' + project: vfc/nfvo/driver/vnfm/svnfm + project-name: 'vfc-nfvo-driver-svnfm-nokia' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index 22840cd94..fc8a0db5c 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -12,8 +12,6 @@ pom: 'nokiav2/pom.xml' pattern: 'nokiav2/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f nokiav2/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -74,3 +72,14 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-builder-4c-4g + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f nokiav2/pom.xml' + project: vfc/nfvo/driver/vnfm/svnfm + project-name: 'vfc-nfvo-driver-svnfm-nokiav2' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' 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 8ff31975d..f3d376483 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -12,8 +12,6 @@ pom: 'zte/vmanager/pom.xml' pattern: 'zte/vmanager/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f zte/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -34,3 +32,14 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-zte-java-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f zte/pom.xml' + project: vfc/nfvo/driver/vnfm/svnfm + project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index 743beff51..25d0f053a 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -8,7 +8,6 @@ branch: 'master' mvn-settings: 'vfc-nfvo-lcm-settings' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,13 @@ mvn-settings: 'vfc-nfvo-lcm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-lcm-java-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/lcm + project-name: 'vfc-nfvo-lcm' + build-node: centos7-redis-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-lcm-settings' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml index f6bb29fa6..4ca4852fa 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml @@ -9,7 +9,6 @@ branch: 'master' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -31,3 +30,13 @@ mvn-settings: 'vfc-nfvo-multivimproxy-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-multivimproxy-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/multivimproxy + project-name: 'vfc-nfvo-multivimproxy' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-multivimproxy-settings' diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 964ef4676..ba51b7dc2 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -9,7 +9,6 @@ branch: 'master' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -31,3 +30,13 @@ mvn-settings: 'vfc-nfvo-resmanagement-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-resmanagement-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/resmanagement + project-name: 'vfc-nfvo-resmanagement' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-resmanagement-settings' diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 1a665e6e4..29ee2a07d 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -19,7 +19,6 @@ script: !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -55,3 +54,13 @@ mvn-settings: 'vfc-nfvo-wfengine-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-wfengine-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/wfengine + project-name: 'vfc-nfvo-wfengine' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 7f4cb3b00..7c4d5fcbc 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -3,7 +3,6 @@ name: vid project-name: 'vid' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': @@ -12,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' @@ -28,6 +29,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' @@ -45,3 +48,13 @@ mvn-settings: 'vid-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vid-clm + jobs: + - gerrit-maven-clm + project: vid + project-name: 'vid' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vid-settings' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index a169794e4..e64ff60c9 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -17,7 +17,6 @@ mvn-settings: 'vnfsdk-dovetail-integration-settings' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{subproject}-python-staging-{stream}' @@ -47,3 +46,13 @@ project: 'vnfsdk/dovetail-integration' project-name: 'vnfsdk-dovetail-integration' branch: 'master' + +- project: + name: vnfsdk-dovetail-integration-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/dovetail-integration + project-name: 'vnfsdk-dovetail-integration' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-dovetail-integration-settings' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index d83b42d89..74416e830 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -3,7 +3,6 @@ name: vnfsdk-functest project-name: 'vnfsdk-functest' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -37,3 +36,13 @@ project: 'vnfsdk/functest' project-name: 'vnfsdk-functest' branch: 'master' + +- project: + name: vnfsdk-functest-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/functest + project-name: 'vnfsdk-functest' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-functest-settings' diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index 0b064052c..16ebadc94 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -24,7 +24,6 @@ mvn-settings: 'vnfsdk-ice-settings' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{subproject}-python-staging-{stream}' @@ -74,3 +73,13 @@ mvn-settings: 'vnfsdk-ice-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vnfsdk-ice-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/ice + project-name: 'vnfsdk-ice' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-ice-settings' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index e30be0458..ceb5e2abc 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -3,7 +3,6 @@ name: vnfsdk-refrepo project-name: 'vnfsdk-refrepo' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -44,3 +43,13 @@ project: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' + +- project: + name: vnfsdk-refrepo-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/refrepo + project-name: 'vnfsdk-refrepo' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-refrepo-settings' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 2a4a03999..377c2d512 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -3,7 +3,6 @@ name: vnfsdk-validation project-name: 'vnfsdk-validation' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,3 +35,13 @@ project: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' + +- project: + name: vnfsdk-validation-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/validation + project-name: 'vnfsdk-validation' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-validation-settings' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index ee9ec08dd..d4f2895c0 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -7,8 +7,6 @@ pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' pattern: 'veslibrary/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - '{project-name}-{stream}-verify-java': mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' @@ -44,3 +42,14 @@ project: 'vnfsdk/ves-agent' project-name: 'vnfsdk-ves-agent' branch: 'master' + +- project: + name: vnfsdk-ves-agent-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' + project: vnfsdk/ves-agent + project-name: 'vnfsdk-ves-agent' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-ves-agent-settings' diff --git a/packer/common-packer b/packer/common-packer index 0029afef9..6961de60e 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 0029afef91fd71afbd62ad41d09a3c4b05cceaa8 +Subproject commit 6961de60eb1b20375b7b6839f05bff9deed6f621