diff options
62 files changed, 68 insertions, 231 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 4ae6b5a57..4c836f9e5 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -28,10 +28,10 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'aai/aai-common' stream: diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 2cbee5737..9cafe0b50 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -26,7 +26,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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 856045e38..3ed17b874 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' project: 'aai/esr-gui' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index b5247c525..c39514e31 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -28,7 +28,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' project: 'aai/esr-server' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 1717455ef..8d6ff0f7b 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -23,7 +23,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'aai/logging-service' stream: - 'release-1.0.0': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 2a6b6ee73..eafe2502c 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -27,7 +27,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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-resources.yaml b/jjb/aai/aai-resources.yaml index 0895c2849..19c5e3f97 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -31,10 +31,10 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-version-daily': pom: 'aai-resources/pom.xml' mvn-goals: 'docker:build docker:push' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 1024d4f53..37c2084a2 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -23,7 +23,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'aai/rest-client' stream: - 'amsterdam': diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index bbf1d7a20..73a6d3a3e 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -23,7 +23,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'aai/router-core' stream: - 'amsterdam': diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 05c43015c..b9cceb808 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -26,7 +26,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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 44eaf133e..87724f400 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -26,7 +26,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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 67cf8b0ac..5c20d259e 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -8,7 +8,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'aai/sparky-fe' stream: - 'master': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index d2581fee6..892cba12c 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -31,10 +31,10 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-aai-docker-java-version-daily': pom: 'aai-traversal/pom.xml' mvn-goals: 'docker:build docker:push' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index c181833c6..49670d468 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -8,7 +8,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - '{project-name}-{stream}-docker-version-java-daily' - '{project-name}-docker-image-blessing' diff --git a/jjb/appc/appc-release.yaml b/jjb/appc/appc-release.yaml index d343a15d0..b65b3d8e5 100644 --- a/jjb/appc/appc-release.yaml +++ b/jjb/appc/appc-release.yaml @@ -9,7 +9,7 @@ build-timeout: 30 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'appc' stream: diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index e983989bb..fe4a84037 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' - '{project-name}-{stream}-docker-version-java-daily' diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index c6c38e34b..405daa63d 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/platform/nbapi' stream: diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index b86f43386..846340988 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/platform/plugins' stream: diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index 24c98ef52..a5c06f137 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/storage/pgaas' stream: diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 3d5f3eb45..f8203ac26 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/utils' stream: diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index b3bdb43b5..5049193c1 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/analytics' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index d2487e3b1..add42386a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/collectors/snmptrap' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index 99a10e46a..0a55b032e 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/collectors' stream: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 087a5c0cb..0e413875c 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/deployments' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 63dea7dcc..296c49aa8 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/blueprints' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index a1a875cdd..70cd7a9a5 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/cdapbroker' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 6013813f4..e7e824124 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/cli' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index a15b5479d..f9c9a714a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/configbinding' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 3f49960d3..13db8951d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/deployment-handler' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 2c8ef2131..96287ad81 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/plugins' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 27e5845e5..35a13513e 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/policy-handler' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 43d348d53..faa561c08 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-shell-daily': mvn-goals: 'clean package docker:build -DpushImage' # No-op diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index 5631a62f5..cb7fd466f 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform' stream: diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index a52155079..2f0fe32ca 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/utils' stream: diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index a3e6ea5c3..67f89298a 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2' stream: diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 4c83b73d7..ccfb7aead 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -8,7 +8,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'demo' stream: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index f520d38e0..0c82e70c2 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -464,169 +464,6 @@ # # The purpose of this job template is to run: # 1. maven set versions - # 2. maven clean deploy - # - # This template skips Sonar scans. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-release-version-java-daily-no-sonar' - - project-type: freestyle - node: '{build-node}' - maven-deploy-properties: - 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: - # 11 AM UTC - - timed: 'H H(10-17) * * *' - - 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}' - 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 - - - maven-target: - maven-version: '{maven-version}' - goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for Java daily release jobs for subprojects - # - # The purpose of this job template is to run: - # 1. maven set versions - # 2. maven clean deploy - # - # This template skips Sonar scans. - # This job supports subprojects. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' - - project-type: freestyle - node: '{build-node}' - maven-deploy-properties: - 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: - # 11 AM UTC - - timed: 'H H(10-17) * * *' - - 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 - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for Java daily release jobs - # - # The purpose of this job template is to run: - # 1. maven set versions # 2. maven clean deploy with Sonar scans # # Required Variables: diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 1140c2e56..eff116850 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -23,4 +23,4 @@ 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' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 488aceed8..780a62ab2 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -16,7 +16,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 45161772e..d07bdb7ab 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -16,7 +16,7 @@ jobs: - '{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}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index dd9414533..4677b1d7b 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -30,7 +30,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}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 8402baede..bb674dd76 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -12,7 +12,7 @@ - '{project-name}-{stream}-{subproject}-release-version3-java-daily' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'oparent' stream: - 'master': diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 0273f2d74..c92d6d499 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -7,10 +7,10 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'policy/api' stream: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index e8883e882..779dbcec2 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -26,7 +26,7 @@ jobs: - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index cc4b7a006..93d277e25 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -26,7 +26,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 43ee57c1b..ddf6fd1ca 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -27,7 +27,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index fcfe6aa8b..a66e006fc 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -27,7 +27,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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' diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index bf8cf337c..b72be3613 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -7,10 +7,10 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'policy/gui' stream: diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 974a15e17..6f6d3a158 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -7,10 +7,10 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'policy/pap' stream: diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml index 918de5f27..1c7338966 100644 --- a/jjb/policy/policy-pdp.yaml +++ b/jjb/policy/policy-pdp.yaml @@ -7,10 +7,10 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{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-no-sonar' + trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'policy/pdp' stream: diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml index d1e2d7efe..a10939f8a 100644 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ b/jjb/sdnc/sdnc-adaptors.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/adaptors' stream: diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml index 9573901f0..7322c54ad 100644 --- a/jjb/sdnc/sdnc-core.yaml +++ b/jjb/sdnc/sdnc-core.yaml @@ -14,7 +14,7 @@ - '{project-name}-{stream}-{subproject}-release-java-daily' - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/core' stream: diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index ea088fce6..380a464b6 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -8,7 +8,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index 864845fd0..71d26e19a 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -7,7 +7,7 @@ java-version: '' - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' project: 'sdnc/plugins' stream: diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 29a66bfdf..2e514589e 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -13,7 +13,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily' files: '**' archive-artifacts: '' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 29ba9c1b6..da2c2341e 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -19,7 +19,7 @@ java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-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-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 28768aef6..3f5455c03 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -18,7 +18,7 @@ java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-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-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 4a218e36c..5460d2693 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -19,7 +19,7 @@ java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-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-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 6a2de98ce..0e23d1ff9 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -20,7 +20,7 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-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-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index d5ffed53f..215c10aeb 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -19,7 +19,7 @@ java-version: '' - '{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}-{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-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index 887eea52b..5b73c051a 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -19,7 +19,7 @@ java-version: '' - '{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}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index f6c7cc9ea..488f42db5 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -15,7 +15,7 @@ java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' |