diff options
119 files changed, 698 insertions, 176 deletions
diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index 2d8758f21..42ed60897 100755 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -28,6 +28,10 @@ To download **ci-management**, execute the following command to clone the `git clone ssh://<LFID>@gerrit.onap.org:29418/ci-management --recursive && scp -p -P 29418 \ <LFID>@gerrit.onap.org:hooks/commit-msg ci-management/.git/hooks/` +Make sure to sync global-jjb submodule using: + +`git submodule update --init` + Once you successfully clone the repository, next step is to install JJB (Jenkins Job Builder) in order to experiment with Jenkins jobs. diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml index da6ca5b55..754fbddd3 100644 --- a/jjb/aaf/aaf-authz-docker.yaml +++ b/jjb/aaf/aaf-authz-docker.yaml @@ -4,7 +4,8 @@ name: aaf-authz-docker project-name: 'aaf-authz-docker' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java-checkstyle' - '{project-name}-{stream}-merge-properties-java': mvn_properties: @@ -17,6 +18,7 @@ - skipDockerTag=true - skipDockerPush=true - '{project-name}-{stream}-docker-java-properties-daily': + setVersion: 'DontSetVersion' docker-pom: 'authz-service/pom.xml' mvn-profile: 'docker' maven-properties: | diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index d5db466d3..89eb4289b 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -3,7 +3,8 @@ name: aaf-authz project-name: 'aaf-authz' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 546bd5da6..d8037596d 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -3,7 +3,8 @@ name: aaf-cadi project-name: 'aaf-cadi' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml index 220db3e61..22d8a2231 100644 --- a/jjb/aaf/aaf-inno.yaml +++ b/jjb/aaf/aaf-inno.yaml @@ -3,7 +3,8 @@ name: aaf-inno project-name: 'aaf-inno' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index d4417c9da..403ddd00c 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -3,7 +3,8 @@ name: aai-aai-common project-name: 'aai-aai-common' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index fcaa803d8..48514f623 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -3,7 +3,9 @@ name: aai-aai-service project-name: 'aai-aai-service' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' + build-timeout: 45 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index c128420e0..30162c76a 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -3,7 +3,8 @@ name: aai-babel project-name: 'aai-babel' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index 9a00da2e2..ce859701c 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -3,7 +3,8 @@ name: aai-champ project-name: 'aai-champ' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 4109ab413..a3c15ee4a 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -3,10 +3,11 @@ name: aai-data-router project-name: 'aai-data-router' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 7e23bc371..e2efa919a 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -3,7 +3,8 @@ name: aai-esr-gui project-name: 'aai-esr-gui' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 7fe252bd1..2f7076ba4 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -3,7 +3,8 @@ name: aai-esr-server project-name: 'aai-esr-server' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index c0271e74d..8aa510ac9 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -3,7 +3,8 @@ name: aai-logging-service project-name: 'aai-logging-service' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 85713cf6f..ac761c518 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -3,10 +3,11 @@ name: aai-model-loader project-name: 'aai-model-loader' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' @@ -14,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 451e38733..0f466e69e 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -3,7 +3,8 @@ name: aai-resources project-name: 'aai-resources' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 8d2163f39..51374a20a 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -3,7 +3,8 @@ name: aai-rest-client project-name: 'aai-rest-client' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index bc855ee72..17323195e 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -3,7 +3,8 @@ name: aai-router-core project-name: 'aai-router-core' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 6595a561f..de9af76f0 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -3,10 +3,11 @@ name: aai-search-data-service project-name: 'aai-search-data-service' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 421d0f9a4..8f49eb3de 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -3,10 +3,11 @@ name: aai-sparky-be project-name: 'aai-sparky-be' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index cb32f7866..fd1b330e6 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -4,7 +4,8 @@ project-name: 'aai-sparky-fe' build-node: 'centos7-basebuild-4c-4g' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 32673328b..3803ca3ba 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -3,7 +3,8 @@ name: aai-traversal project-name: 'aai-traversal' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index 68a14e1a4..782e6e253 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -4,7 +4,8 @@ name: appc-deployment project-name: 'appc-deployment' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' @@ -16,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index ff31a1746..82615fea8 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -3,18 +3,19 @@ name: appc-master project-name: 'appc' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' + mvn-params: '-DskipTests' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'appc' stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'appc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 8601939e1..05a134d9a 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -3,7 +3,8 @@ name: ccsdk-dashboard project-name: 'ccsdk-dashboard' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 4199daf82..6cc35c800 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -3,7 +3,8 @@ name: ccsdk-distribution project-name: 'ccsdk-distribution' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' @@ -14,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 2efb907aa..ac8024c1c 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -3,7 +3,8 @@ name: ccsdk-parent project-name: 'ccsdk-parent' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-parent-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index 1f91e3acb..cbd51ddb6 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -3,7 +3,8 @@ name: ccsdk-platform-nbapi project-name: 'ccsdk-platform-nbapi' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-platform-nbapi-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 83a5b2e5b..1fc194a5f 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -3,7 +3,8 @@ name: ccsdk-platform-plugins project-name: 'ccsdk-platform-plugins' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index e93bc69a9..7ef392550 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -3,7 +3,8 @@ name: ccsdk-sli-adaptors project-name: 'ccsdk-sli-adaptors' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-sli-adaptors-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 7518caf67..45ec03993 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -3,7 +3,8 @@ name: ccsdk-sli-core project-name: 'ccsdk-sli-core' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-sli-core-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 7bd0ad657..aacb71c71 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -3,7 +3,8 @@ name: ccsdk-sli-northbound project-name: 'ccsdk-sli-northbound' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-sli-northbound-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index dc3c7f288..e24c1ca7e 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -3,7 +3,8 @@ name: ccsdk-sli-plugins project-name: 'ccsdk-sli-plugins' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-sli-plugins-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index 7005eb7a3..796163342 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -3,7 +3,8 @@ name: ccsdk-storage-pgaas project-name: 'ccsdk-storage-pgaas' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-storage-pgaas-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index c11b5266e..b0d53baa8 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -3,7 +3,8 @@ name: ccsdk-utils project-name: 'ccsdk-utils' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'ccsdk-utils-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index da9bc2548..746caa0ea 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -16,6 +16,7 @@ - skipDockerTag=true - skipDockerPush=true - '{project-name}-{stream}-docker-java-properties-daily': + setVersion: 'DoSetVersion' docker-pom: 'pom.xml' mvn-profile: 'docker' maven-properties: | diff --git a/jjb/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml index 798b16c19..48d1151ef 100644 --- a/jjb/cli/cli-csit.yaml +++ b/jjb/cli/cli-csit.yaml @@ -5,7 +5,9 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'cli' - stream: 'master' + stream: + - 'master': + branch: 'master' functionality: - 'sanity-check': trigger_jobs: diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 2137f463d..723e96932 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -4,7 +4,8 @@ name: cli project-name: 'cli' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,6 +21,8 @@ stream: - 'master': branch: 'master' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'cli-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index 33f216bae..b7609bdea 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -12,19 +12,13 @@ project: 'dcaegen2/analytics/tca'
mvn-settings: 'dcaegen2-analytics-tca-settings'
files: '**'
+ maven-deploy-properties: |
+ deployAtEnd=true
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
jobs:
- - '{project-name}-{stream}-release-java-daily':
- mvn-goals-versioning:
- 'versions:set versions:update-child-modules versions:commit'
- mvn-goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
- maven-deploy-properties: |
- deployAtEnd=true
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-verify-java-skip-tests':
mvn-goals: 'clean install'
- '{project-name}-{stream}-merge-java':
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 3d43021dc..226d861b9 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -4,7 +4,8 @@ name: demo project-name: 'demo' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 9dd324fe0..4a08f7f73 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -3,7 +3,8 @@ name: dmaap-messagerouter-dmaapclient project-name: 'dmaap-messagerouter-dmaapclient' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 90f4689df..498ddba0b 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -4,7 +4,8 @@ name: dmaap-messagerouter-docker project-name: 'dmaap-messagerouter-docker' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 591f33282..f275a4f2c 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -3,7 +3,8 @@ name: dmaap-messagerouter-messageservice project-name: 'dmaap-messagerouter-messageservice' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 44742be9e..10d6169ba 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -3,7 +3,8 @@ name: dmaap-messagerouter-mirroragent
project-name: 'dmaap-messagerouter-mirroragent'
jobs:
- - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 1d360a733..a7b0b8094 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -3,7 +3,8 @@ name: dmaap-messagerouter-msgrtr project-name: 'dmaap-messagerouter-msgrtr' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index b8c33dfa2..adba3e9d2 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -16,3 +16,5 @@ stream: - master: branch: 'master' + - amsterdam: + branch: 'amsterdam' diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index d92e62172..7ec69c6ad 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -20,7 +20,6 @@ # Java jdk: '' - java-version: openjdk8 # Maven onap-infra-mvn-opts: | diff --git a/jjb/global-jjb b/jjb/global-jjb -Subproject 21f2869c8f8ac7b2b21130eb16231a8df2904f5 +Subproject 98512a2a3e4aacecc5834f4d3b51d8c5333045f diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 9cbae2ed2..c8d566500 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -947,6 +947,7 @@ properties-file: version.properties - maven-target: maven-version: '{maven-version}' + pom: '{pom}' goals: 'versions:set versions:update-child-modules versions:commit -B' properties: - 'newVersion=${{release_version}}' @@ -1457,6 +1458,22 @@ - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' + - conditional-step: + condition-kind: regex-match + regex: DoSetVersion + label: '{setVersion}' + steps: + - inject: + properties-file: version.properties + - maven-target: + maven-version: '{maven-version}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp - docker-login - maven-docker-push-daily: maven-version: '{maven-version}' @@ -1599,6 +1616,79 @@ maven-version: '{maven-version}' - job-template: + name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - maven-exec: + maven-version: '{maven-version}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 12 AM UTC + - timed: 'H 12 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - inject: + properties-file: version.properties + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - docker-login + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: '{mvn-goals}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - shell: '{script}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: name: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' @@ -1667,6 +1757,76 @@ maven-version: '{maven-version}' - job-template: + name: '{project-name}-{stream}-{subproject}-docker-version-java-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - maven-exec: + maven-version: '{maven-version}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 12 AM UTC + - timed: 'H 12 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - inject: + properties-file: version.properties + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - docker-login + + - maven-docker-push-daily: + maven-version: '{maven-version}' + pom: '{pom}' + mvn-settings: '{mvn-settings}' + pom: '{docker-pom}' + # use default as mvn-profile if profile is not needed + mvn-profile: '{mvn-profile}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: name: '{project-name}-{stream}-aai-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' @@ -2129,7 +2289,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{site-pom}' - goals: 'clean site:site site:stage-deploy' + goals: 'clean site:site site:stage-deploy -B' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index c2da1cd9e..991ffd69a 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -752,14 +752,14 @@ # vim: sw=2 ts=2 sts=2 et : - job-template: - # Job template for scm and script trigger - for docker merge + # Job template for two scm and script trigger - for docker merge # # Required Variables: # branch: git branch # build-node: what build node to run on # script: build script to execute - name: '{project-name}-{stream}-merge-docker-script' + name: '{project-name}-{stream}-two-scm-merge-docker-script' project-type: freestyle concurrent: true @@ -784,15 +784,10 @@ choosing-strategy: 'default' submodule-recursive: '{submodule-recursive}' - git-extra-project: - project: '{extra-project1}' - refspec: '{extra-refspec1}' - branch: '{extra-branch1}' - checkout-dir: '{checkout-dir1}' - - git-extra-project: - project: '{extra-project2}' - refspec: '{extra-refspec2}' - branch: '{extra-branch2}' - checkout-dir: '{checkout-dir2}' + project: '{extra-project}' + refspec: '{extra-refspec}' + branch: '{extra-branch}' + checkout-dir: '{checkout-dir}' wrappers: - infra-wrappers: @@ -825,14 +820,14 @@ maven-version: '{maven-version}' - job-template: - # Job template for scm and script trigger - for docker daily release + # Job template for two scm and script trigger - for docker daily release # # Required Variables: # branch: git branch # build-node: what build node to run on # script: build script to execute - name: '{project-name}-{stream}-release-docker-script-manual' + name: '{project-name}-{stream}-two-scm-release-docker-script-manual' project-type: freestyle concurrent: true @@ -857,15 +852,10 @@ choosing-strategy: 'default' submodule-recursive: '{submodule-recursive}' - git-extra-project: - project: '{extra-project1}' - refspec: '{extra-refspec1}' - branch: '{extra-branch1}' - checkout-dir: '{checkout-dir1}' - - git-extra-project: - project: '{extra-project2}' - refspec: '{extra-refspec2}' - branch: '{extra-branch2}' - checkout-dir: '{checkout-dir2}' + project: '{extra-project}' + refspec: '{extra-refspec}' + branch: '{extra-branch}' + checkout-dir: '{checkout-dir}' wrappers: - infra-wrappers: diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 25f93aff6..4b2fa3194 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -3,7 +3,8 @@ name: holmes-common project-name: 'holmes-common' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml index 34362cc58..592cfd84f 100644 --- a/jjb/holmes/holmes-dsa.yaml +++ b/jjb/holmes/holmes-dsa.yaml @@ -3,7 +3,8 @@ name: holmes-dsa project-name: 'holmes-dsa' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 31aac3f49..5e1077682 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -3,7 +3,8 @@ name: holmes-engine-management project-name: 'holmes-engine-management' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index ab143e62a..d88aef4ef 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -3,7 +3,8 @@ name: holmes-rule-management project-name: 'holmes-rule-management' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh index 3cc95081f..c0394de81 100755 --- a/jjb/include-docker-push.sh +++ b/jjb/include-docker-push.sh @@ -29,7 +29,7 @@ if [ ! -z "$DOCKER_IMAGE_NAME" ]; then # tag image with nexus3 proxy prefix docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH elif [[ $PROJECT =~ $SEARCH ]] ; then - REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai; + REPO_PATH=$DOCKER_REPOSITORY/onap/ajsc-aai; else # Cut the prefix aai/ in example aai/model-loader DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-); diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index c3f05429e..781e3763d 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -15,6 +15,22 @@ default: '{test-options}' description: 'Robot command options' +- parameter: + name: html-publisher-dir + parameters: + - string: + name: HTMLDIR + default: '{html-dir}' + description: 'Directory location to be used by HTML publisher plugin' + +- parameter: + name: html-publisher-files + parameters: + - string: + name: HTMLFILES + default: '{html-files}' + description: 'File name to be used by HTML publisher plugin to produce the report' + - builder: name: integration-install-robotframework builders: diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index 4018309d9..ccba91a2d 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -54,6 +54,76 @@ - lf-infra-publish - job-template: + name: '{project-name}-{stream}-verify-csit-{functionality}-testng' + disabled: false + + project-type: freestyle + build-node: 'ubuntu1604-docker-8c-8g' + node: '{build-node}' + + properties: + - lf-infra-properties: + project: 'integration' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: 'integration' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-plan: + test-plan: 'plans/{project-name}/{functionality}' + - integration-test-options: + test-options: '{robot-options}' + - html-publisher-dir: + html-dir: '{html-dir}' + - html-publisher-files: + html-files: '{html-files}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: 'integration' + branch: '{branch}' + files: 'test/csit/**/{project-name}/**' + + builders: + - integration-install-robotframework + - inject: + properties-file: 'env.properties' + - integration-run-test + + publishers: + - integration-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + - testng: + pattern: archives/testng-results.xml + escape-test-description: true + escape-exception-msg: true + show-failed-builds: true + - html-publisher: + allow-missing: false + dir: '{html-dir}' + files: '{html-files}' + keep-all: false + link-to-last-build: false + name: ExtentReport + +- job-template: name: '{project-name}-{stream}-csit-{functionality}' disabled: false diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 1243121eb..adfd8853e 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -3,10 +3,14 @@ name: integration project-name: 'integration' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' project: 'integration' + subproject: + - 'version-manifest': + pom: 'version-manifest/pom.xml' + pattern: 'version-manifest/**' stream: - 'master': branch: 'master' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml new file mode 100644 index 000000000..ee8de9c79 --- /dev/null +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml @@ -0,0 +1,15 @@ +--- + +- project: + name: modeling-toscaparsers-javatoscachecker-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'modeling-toscaparsers-javatoscachecker' + stream: 'master' + functionality: + - 'APIs': + trigger_jobs: + - '{project-name}-{stream}-release-version-java-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 892a99cb4..2b7696859 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'modeling-toscaparsers-settings' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-docker-8c-8g subproject: - 'javatoscachecker': pattern: 'javatoscachecker/**' @@ -16,4 +16,12 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-properties-daily': + setVersion: 'DontSetVersion' + docker-pom: 'javatoscachecker/pom.xml' + mvn-profile: 'docker' + maven-properties: | + skip.docker.build=false + skip.docker.tag=false + skip.docker.push=false diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 4fb3df3c4..f7c03ea89 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -16,7 +16,9 @@ pom: 'nfvparser/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' + 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-no-sonar' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index e0e602e60..1035ec206 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -3,7 +3,8 @@ name: msb-apigateway project-name: 'msb-apigateway' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 7156dceee..5f5702a25 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -3,7 +3,8 @@ name: msb-discovery project-name: 'msb-discovery' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index dcb1a2c9c..7bacfd9cd 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -3,7 +3,8 @@ name: msb-java-sdk project-name: 'msb-java-sdk' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index fd9539a21..90b12b16a 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -3,7 +3,8 @@ name: msb-swagger-sdk project-name: 'msb-swagger-sdk' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh index 0a8f304ad..6cfe920ed 100644 --- a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh @@ -9,6 +9,3 @@ chmod 755 ./vio/docker/*.* ./vio/docker/build_image.sh -echo '========================== Building docker for vesagent ==========================' -chmod 755 ./vesagent/docker/*.* -./vesagent/docker/docker-build.sh diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh new file mode 100644 index 000000000..bdb5a849c --- /dev/null +++ b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +echo '========================== Building docker for vesagent ==========================' +chmod 755 ./vesagent/docker/*.* +./vesagent/docker/docker-build.sh diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index dd3026a5b..6b6e9a648 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -11,9 +11,6 @@ - 'vio': pom: 'vio/pom.xml' pattern: 'vio/**' - - 'vesagent': - pom: 'vesagent/pom.xml' - pattern: 'vesagent/**' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml new file mode 100644 index 000000000..1d4fa6b33 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml @@ -0,0 +1,25 @@ +--- +- project: + name: multicloud-openstack-vmware-vesagent-java + project-name: 'multicloud-openstack-vmware-vesagent' + project: 'multicloud/openstack/vmware' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' + subproject: + - 'vesagent': + pom: 'vesagent/pom.xml' + pattern: 'vesagent/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml new file mode 100644 index 000000000..0a8fcd4a0 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-python.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: multicloud-openstack-vmware-vesagent-python + project-name: 'multicloud-openstack-vmware-vesagent' + project: 'multicloud/openstack/vmware' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' + build-node: 'ubuntu1604-basebuild-4c-4g' + subproject: + - 'vesagent': + path: 'vesagent' + pattern: 'vesagent/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 94ac2ab84..655bd8cd1 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -24,6 +24,7 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/oom/oneclick-config-build-docker-image.sh b/jjb/oom/oneclick-config-build-docker-image.sh index 2cee98fbc..a0d7168f1 100644 --- a/jjb/oom/oneclick-config-build-docker-image.sh +++ b/jjb/oom/oneclick-config-build-docker-image.sh @@ -9,4 +9,4 @@ cd kubernetes/config/docker/init chmod 755 *.* -docker build +docker build . diff --git a/jjb/oom/oneclick-config-make-tar.sh b/jjb/oom/oneclick-config-make-tar.sh index da2da2000..0f63e0962 100644 --- a/jjb/oom/oneclick-config-make-tar.sh +++ b/jjb/oom/oneclick-config-make-tar.sh @@ -9,4 +9,5 @@ cd kubernetes/config/docker/init chmod 755 *.* -./make-tar.sh +cd src/config +tar -czvf ../../onap-cfg.tar.gz * diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index befce135d..3f2088cd2 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -3,7 +3,8 @@ name: oom-registrator project-name: 'oom-registrator' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 0720d89c0..131695e6f 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -3,7 +3,8 @@ name: policy-api project-name: 'policy-api' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 2d13f9881..2df702731 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -3,7 +3,8 @@ name: policy-common project-name: 'policy-common' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index c322d70b1..44c6608da 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -3,7 +3,8 @@ name: policy-drools-applications project-name: 'policy-drools-applications' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 137189526..7dce80e3c 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -3,7 +3,9 @@ name: policy-drools-pdp project-name: 'policy-drools-pdp' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' + mvn-params: '-DskipTests' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 01219cb54..8fd4cd15a 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -3,7 +3,9 @@ name: policy-engine project-name: 'policy-engine' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' + build-timeout: 30 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 7b96f0a58..fb3206a4a 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -3,7 +3,8 @@ name: policy-gui project-name: 'policy-gui' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index da763bd53..c0407e965 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -3,7 +3,8 @@ name: policy-pap project-name: 'policy-pap' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml index 1dec30aa5..31c7b5bff 100644 --- a/jjb/policy/policy-pdp.yaml +++ b/jjb/policy/policy-pdp.yaml @@ -3,7 +3,8 @@ name: policy-pdp project-name: 'policy-pdp' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index 63304419d..67a518a40 100644 --- a/jjb/portal/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -21,8 +21,10 @@ stream: - 'master': branch: 'master' - - 'release-1.3.0': - branch: 'release-1.3.0' + - 'release-1.3.1': + branch: 'release-1.3.1' + - 'release-1.3.2': + branch: 'release-1.3.2' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index 712e490e2..71edff8d7 100644 --- a/jjb/portal/portal-docker.yaml +++ b/jjb/portal/portal-docker.yaml @@ -4,28 +4,26 @@ name: portal-docker project-name: 'portal-docker' jobs: - - '{project-name}-{stream}-three-scm-verify-script': + - '{project-name}-{stream}-two-scm-verify-script': script: !include-raw-escape: 'docker-build-deploy.sh' - - '{project-name}-{stream}-merge-docker-script': + - '{project-name}-{stream}-two-scm-merge-docker-script': script: !include-raw-escape: 'docker-build-push.sh' - - '{project-name}-{stream}-release-docker-script-manual': + - '{project-name}-{stream}-two-scm-release-docker-script-manual': script: !include-raw-escape: 'docker-build-release.sh' project: 'portal' stream: - 'master': branch: 'master' + - 'release-1.3.0': + branch: 'release-1.3.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g - extra-project1: 'portal/sdk' - extra-branch1: '{branch}' - extra-refspec1: 'refs/heads/{branch}' - checkout-dir1: 'sdk' - extra-project2: 'ui/dmaapbc' - extra-branch2: '{branch}' - extra-refspec2: 'refs/heads/{branch}' - checkout-dir2: 'dmaapbc' + extra-project: 'portal/sdk' + extra-branch: '{branch}' + extra-refspec: 'refs/heads/{branch}' + checkout-dir: 'sdk' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index ef05814cc..e16aa1aa3 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -3,14 +3,16 @@ name: portal project-name: 'portal' jobs: - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' + trigger-job: '{project-name}-{stream}-release-java-daily' project: 'portal' stream: - 'master': branch: 'master' + - 'release-1.3.0': + branch: 'release-1.3.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 196c2938e..5a4c9bf26 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -5,10 +5,15 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'sdc' - stream: 'master' + stream: + - 'master': + branch: 'master' functionality: - 'sanity': trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + - '{project-name}-{stream}-sdc-merge-java' + - 'nightly': + trigger_jobs: + - '{project-name}-{stream}-docker-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 5d45b24c5..7cd609411 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -4,7 +4,8 @@ name: sdc-jtosca project-name: 'sdc-jtosca' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index a76db75aa..186ae142e 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -4,7 +4,8 @@ name: sdc-sdc-distribution-client project-name: 'sdc-sdc-distribution-client' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index cbe41fdf8..df39d9289 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -4,7 +4,8 @@ name: sdc-sdc-titan-cassandra project-name: 'sdc-sdc-titan-cassandra' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 4c43e27e6..4381189b4 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -4,7 +4,8 @@ name: sdc-sdc-tosca project-name: 'sdc-sdc-tosca' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 589f41bae..139ac95fa 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -3,7 +3,8 @@ name: sdc-sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml index a85775785..3a8b5b5c5 100644 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ b/jjb/sdnc/sdnc-adaptors.yaml @@ -3,7 +3,8 @@ name: sdnc-adaptors project-name: 'sdnc-adaptors' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml index 9648bd181..17ee14fd2 100644 --- a/jjb/sdnc/sdnc-core.yaml +++ b/jjb/sdnc/sdnc-core.yaml @@ -7,7 +7,8 @@ pom: 'rootpom/pom.xml' pattern: 'rootpom/**' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 1bef5027a..e78d50b53 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -3,7 +3,8 @@ name: sdnc-northbound project-name: 'sdnc-northbound' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -12,6 +13,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index b2705abf6..487ab04cc 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -4,7 +4,8 @@ name: sdnc-oam project-name: 'sdnc-oam' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' @@ -16,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index 9d32e23e5..1e62e70cd 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -3,7 +3,8 @@ name: sdnc-plugins project-name: 'sdnc-plugins' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 957492b93..cf266a522 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -3,7 +3,8 @@ name: so-libs project-name: 'so-libs' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 46d2570a0..9f7d0f785 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -4,7 +4,8 @@ project-name: 'ui-dmaapbc' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -16,8 +17,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - 'release-1.1.0': branch: 'release-1.1.0' mvn-settings: 'ui-dmaapbc-settings' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 6f16c12c1..727c60391 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -11,7 +11,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' files: '**' archive-artifacts: '' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index cd8368c7e..69c7f831c 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -11,6 +11,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-daily' files: '**' archive-artifacts: '' diff --git a/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh new file mode 100644 index 000000000..495220f26 --- /dev/null +++ b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./activiti-extension/src/main/docker/*.sh +./activiti-extension/src/main/docker/activiti-docker-build_image.sh + diff --git a/jjb/vfc/build-nfvo-wfengine-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh index de7d13bd1..3a27413df 100644 --- a/jjb/vfc/build-nfvo-wfengine-docker-image.sh +++ b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh @@ -5,9 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./activiti-extension/src/main/docker/*.sh -./activiti-extension/src/main/docker/activiti-docker-build_image.sh - chmod 755 ./wfenginemgrservice/src/main/docker/*.sh ./wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 1a05a1009..d995db4dc 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -14,7 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version3-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index a7406c6ab..cc2c8650b 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -14,7 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version3-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml index 68e0e644c..a1af3b773 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml @@ -15,6 +15,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index 0613b38ce..c14b7a9c2 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -14,7 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version3-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 0d2437328..2dc778d16 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -9,15 +9,10 @@ - 'master': branch: 'master' build-node: ubuntu1604-basebuild-4c-4g - subproject: - - 'deployment': - pom: 'ResmanagementService/deployment/pom.xml' - pattern: 'ResmanagementService/deployment/**' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-{subproject}-release-version3-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml index 91bad74ab..b23a90d7b 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml @@ -9,6 +9,7 @@ functionality: - 'sanity-check': trigger_jobs: - - 'vfc-nfvo-wfengine-master-docker-java-version-shell-daily' + - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily' + - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily' robot-options: '' branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 8759a56d0..570909b64 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -12,18 +12,19 @@ - 'engine-mgr-service': pom: 'wfenginemgrservice/pom.xml' pattern: 'wfenginemgrservice/**' + script: + !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' - 'engine-activiti-extension': pom: 'activiti-extension/pom.xml' pattern: 'activiti-extension/**' + script: + !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-wfengine-docker-image.sh' + - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': + mvn-goals: 'clean' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vid/vid-asdcclient.yaml b/jjb/vid/vid-asdcclient.yaml index 46c27089b..d8f09de9e 100644 --- a/jjb/vid/vid-asdcclient.yaml +++ b/jjb/vid/vid-asdcclient.yaml @@ -3,7 +3,8 @@ name: vid-asdcclient project-name: 'vid-asdcclient' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index 46e1688ed..b1124ab70 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -9,6 +9,6 @@ functionality: - 'healthCheck': trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + - '{project-name}-{stream}-docker-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 5382f9f1c..c8438e0d8 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -3,7 +3,8 @@ name: vid project-name: 'vid' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/vnfsdk/vnfsdk-compliance-csit.yaml b/jjb/vnfsdk/vnfsdk-compliance-csit.yaml new file mode 100644 index 000000000..6ed6fef66 --- /dev/null +++ b/jjb/vnfsdk/vnfsdk-compliance-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vnfsdk-compliance-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vnfsdk-compliance' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' + branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-compliance.yaml b/jjb/vnfsdk/vnfsdk-compliance.yaml new file mode 100644 index 000000000..400b152ef --- /dev/null +++ b/jjb/vnfsdk/vnfsdk-compliance.yaml @@ -0,0 +1,27 @@ +--- +- project: + name: vnfsdk-compliance + project-name: 'vnfsdk-compliance' + jobs: + - gerrit-maven-clm: + java-version: '' + mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' + mvn-goals: 'docker:build' + docker-image-name: 'onap/compliance' + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' + mvn-profile: 'docker' + + project: 'vnfsdk/compliance' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vnfsdk-compliance-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 86dda376b..853a8b59d 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -3,7 +3,8 @@ name: vnfsdk-refrepo project-name: 'vnfsdk-refrepo' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index ef20415a3..1d2855631 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -3,7 +3,8 @@ name: vnfsdk-validation project-name: 'vnfsdk-validation' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml index fd8b7c43f..a98685b9b 100644 --- a/jjb/vvp/vvp-engagementmgr.yaml +++ b/jjb/vvp/vvp-engagementmgr.yaml @@ -15,5 +15,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 261f75fde..aba8b19ce 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -13,13 +13,13 @@ rh_systems() { yum install -y openssl-devel mysql-devel gcc # Autorelease support packages - yum install -y firefox python-tox xmlstarlet xvfb + yum install -y firefox python-tox xmlstarlet xvfb crudini maven # Install chrome to support ChromeDriver - cat <<EOF > /etc/yum.repos.d/google-chrome.repo + cat << EOF > /etc/yum.repos.d/google-chrome.repo [google-chrome] -name=google-chrome -baseurl=http://dl.google.com/linux/chrome/rpm/stable/$basearch +name=google-chrome - \$basearch +baseurl=http://dl.google.com/linux/chrome/rpm/stable/\$basearch enabled=1 gpgcheck=1 gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub @@ -53,6 +53,11 @@ EOF } ubuntu_systems() { + # Install python3.6 + sudo add-apt-repository -y ppa:jonathonf/python-3.6 + sudo apt-get update + sudo apt-get install -y python3.6 python3.6-dev + # Install python dependencies apt-get install -y python-{dev,virtualenv,setuptools,pip} @@ -60,7 +65,7 @@ ubuntu_systems() { apt-get install -y libssl-dev libmysqlclient-dev gcc # Autorelease support packages - apt-get install -y firefox python-tox xmlstarlet xvfb + apt-get install -y firefox python-tox xmlstarlet xvfb crudini maven # Install chrome to support ChromeDriver wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index d97f0e2ed..cae373e60 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -52,7 +52,7 @@ rh_systems() { # separate group installs from package installs since a non-existing # group with dnf based systems (F21+) will fail the install if such # a group does not exist - yum install -y unzip xz puppet git git-review perl-XML-XPath wget make + yum install -y unzip xz puppet git git-review perl-XML-XPath wget make npm # All of our systems require Java (because of Jenkins) # Install all versions of the OpenJDK devel but force 1.7.0 to be the @@ -121,7 +121,7 @@ EOF # add in stuff we know we need echo "---> Installing base packages" - apt-get install unzip xz-utils puppet git git-review libxml-xpath-perl make wget + apt-get install -y unzip xz-utils puppet git git-review libxml-xpath-perl make wget npm # install Java 7 echo "---> Configuring OpenJDK" diff --git a/packer/provision/docker.sh b/packer/provision/docker.sh index 593b5c781..9d34eb079 100644 --- a/packer/provision/docker.sh +++ b/packer/provision/docker.sh @@ -29,9 +29,55 @@ EOL groupadd docker } +ubuntu_docker_mtu_fix(){ + echo "---> Fixing docker's mtu settings" + systemctl stop docker + cat <<'EOL' > /etc/systemd/system/docker.service +[Unit] +Description=Docker Application Container Engine +Documentation=https://docs.docker.com +After=network.target docker.socket +Requires=docker.socket + +[Service] +Type=notify +# the default is not to use systemd for cgroups because the delegate issues still +# exists and systemd currently does not support the cgroup feature set required +# for containers run by docker +ExecStart= +ExecStart=/usr/bin/dockerd --mtu 1454 -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock +ExecReload=/bin/kill -s HUP $MAINPID +# Having non-zero Limit*s causes performance problems due to accounting overhead +# in the kernel. We recommend using cgroups to do container-local accounting. +LimitNOFILE=infinity +LimitNPROC=infinity +LimitCORE=infinity +# Uncomment TasksMax if your systemd version supports it. +# Only systemd 226 and above support this version. +TasksMax=infinity +TimeoutStartSec=0 +# set delegate yes so that systemd does not reset the cgroups of docker containers +Delegate=yes +# kill only the docker process, not all processes in the cgroup +KillMode=process + +[Install] +WantedBy=multi-user.target +EOL + systemctl start docker + echo "---> Checking MTU" + docker network inspect bridge + echo "---> MTU set to 1454" +} + ubuntu_systems() { # Assumes that python is already installed by basebuild + # Install Python3.6 + sudo add-apt-repository -y ppa:jonathonf/python-3.6 + sudo apt-get update + sudo apt-get install -y python3.6 python3.6-dev + # Install dependencies for robotframework and robotframework-sshlibrary apt install -y unzip sshuttle netcat libffi-dev libssl-dev wget https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz @@ -40,6 +86,9 @@ ubuntu_systems() { # Install docker apt install -y docker.io + + # Fixing Docker MTU settings + ubuntu_docker_mtu_fix } all_systems() { |