From: Jessica Wagantall Date: Thu, 19 Oct 2017 15:18:17 +0000 (+0000) Subject: Merge "Correct job template for docker image processing" X-Git-Tag: 1.0.0-Amsterdam~39 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7d5fd0bd3c78cf1d296fcaec9dadd9ac11c34b01;hp=4129f0180eb2d5b701b9f6b4a448423f0026550f;p=ci-management.git Merge "Correct job template for docker image processing" --- 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..496f299e7 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -3,7 +3,8 @@ name: aai-aai-service project-name: 'aai-aai-service' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + java-version: '' - '{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..125ec0e92 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -3,7 +3,8 @@ 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' 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..2ca84f1a8 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -3,7 +3,8 @@ 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' 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..6d32697b5 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -3,7 +3,8 @@ 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' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 421d0f9a4..2b5b17498 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -3,7 +3,8 @@ 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' 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..c6bd45f56 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' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index ff31a1746..acd147baa 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -3,7 +3,8 @@ name: appc-master project-name: 'appc' 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/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..a77f6a3c9 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' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 2efb907aa..d1a4204b6 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' diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index 1f91e3acb..771087aaf 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' 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..cc51531c0 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' diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 7518caf67..16beca1f5 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' diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 7bd0ad657..1f7c4a884 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' diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index dc3c7f288..120ecec62 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' diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index 7005eb7a3..ba8327aaa 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' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index c11b5266e..6613e874c 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' 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.yaml b/jjb/cli/cli.yaml index 2137f463d..03180f440 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' 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/global-defaults.yaml b/jjb/global-defaults.yaml index de267e229..7ec69c6ad 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -20,7 +20,6 @@ # Java jdk: '' - java-version: '' # Maven onap-infra-mvn-opts: | diff --git a/jjb/global-jjb b/jjb/global-jjb index 21f2869c8..c38dce208 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit 21f2869c8f8ac7b2b21130eb16231a8df2904f5c +Subproject commit c38dce2088f0833b94b8811bbd1efc3e74e8b06b diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index be02418eb..e31a470df 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1458,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}' 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 df42fa7b9..c0394de81 100755 --- a/jjb/include-docker-push.sh +++ b/jjb/include-docker-push.sh @@ -29,12 +29,12 @@ 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-); - REPO_PATH=$DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME}; + REPO_PATH=$DOCKER_REPOSITORY/onap/${DOCKER_REPO_NAME}; fi diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 4fb3df3c4..099e22749 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -16,7 +16,8 @@ pom: 'nfvparser/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - - 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-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/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..9d99ae12d 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -3,7 +3,8 @@ name: policy-drools-pdp project-name: 'policy-drools-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' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 01219cb54..9f786d341 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -3,7 +3,8 @@ name: policy-engine project-name: 'policy-engine' 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-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/portal-sdk.yaml index 63304419d..bb2e3a482 100644 --- a/jjb/portal/portal-sdk.yaml +++ b/jjb/portal/portal-sdk.yaml @@ -23,6 +23,8 @@ branch: 'master' - 'release-1.3.0': branch: 'release-1.3.0' + - 'release-1.3.1': + branch: 'release-1.3.1' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' 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..24ceeb55c 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' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index b2705abf6..4f8a83f8d 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' 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..805938659 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' 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-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/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-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..a0d34e72e 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -13,7 +13,7 @@ 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 # Install chrome to support ChromeDriver cat < /etc/yum.repos.d/google-chrome.repo @@ -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 + # 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 # 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/docker.sh b/packer/provision/docker.sh index 593b5c781..325e328e2 100644 --- a/packer/provision/docker.sh +++ b/packer/provision/docker.sh @@ -32,6 +32,11 @@ EOL 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 + # 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