From: Jessica Wagantall Date: Fri, 16 Feb 2018 18:04:51 +0000 (+0000) Subject: Merge "Remove amsterdam jobs and disable daily" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6d55635fceae5e06f595580d5a37edc78dea7b8a;hp=-c;p=ci-management.git Merge "Remove amsterdam jobs and disable daily" --- 6d55635fceae5e06f595580d5a37edc78dea7b8a diff --combined jjb/aai/aai-aai-common.yaml index 88f028ac2,9faf073e4..2a89847de --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@@ -6,10 -6,12 +6,12 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' + disabled: true project: 'aai/aai-common' stream: @@@ -19,31 -21,10 +21,11 @@@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - - project: - name: aai-aai-common-releases - project-name: 'aai-aai-common' - jobs: - - gerrit-maven-clm: - - '{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: 'aai/aai-common' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-aai-common-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g - project: name: aai-aai-common-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' diff --combined jjb/aai/aai-babel.yaml index f1076c7bb,5124ffe64..d7e121909 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@@ -6,10 -6,12 +6,12 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-java-daily': + disabled: true - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' + disabled: true project: 'aai/babel' stream: - 'master': @@@ -22,7 -24,6 +24,7 @@@ name: aai-babel-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/babel' project-name: 'aai-babel' diff --combined jjb/aai/aai-champ.yaml index 0d73740e7,3547d88d6..527c0c6b3 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@@ -6,10 -6,12 +6,12 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' + disabled: true project: 'aai/champ' stream: @@@ -23,7 -25,6 +25,7 @@@ name: aai-champ-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/champ' project-name: 'aai-champ' diff --combined jjb/aai/aai-data-router.yaml index beb6279d0,a684a40ae..b4ceb6fa7 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@@ -6,10 -6,12 +6,12 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' + disabled: true project: 'aai/data-router' stream: - 'master': @@@ -17,29 -19,10 +19,11 @@@ mvn-settings: 'aai-data-router-settings' files: '**' archive-artifacts: '' - - project: - name: aai-data-router-releases - project-name: 'aai-data-router' - jobs: - - gerrit-maven-clm: - - '{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: 'pom.xml' - mvn-goals: 'docker:build' - project: 'aai/data-router' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-data-router-settings' - files: '**' - archive-artifacts: '' - project: name: aai-data-router-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/data-router' project-name: 'aai-data-router' diff --combined jjb/aai/aai-esr-gui.yaml index 59a68e637,89d02f03a..aa0cd3ac4 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@@ -13,8 -13,6 +13,6 @@@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'aai-esr-gui-settings' files: '**' archive-artifacts: '' @@@ -25,7 -23,6 +23,7 @@@ name: aai-esr-gui-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/esr-gui' project-name: 'aai-esr-gui' diff --combined jjb/aai/aai-esr-server.yaml index e59629a0b,6cacb03cb..113b2d97a --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@@ -19,31 -19,10 +19,11 @@@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g - - project: - name: aai-esr-server-releases - project-name: 'aai-esr-server' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily' - - project: 'aai/esr-server' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-esr-server-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-basebuild-4c-4g - project: name: aai-esr-server-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/esr-server' project-name: 'aai-esr-server' diff --combined jjb/aai/aai-logging-service.yaml index cae60a272,5849d1696..f6a15d905 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@@ -6,7 -6,8 +6,8 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true project: 'aai/logging-service' stream: - 'master': @@@ -14,28 -15,11 +15,12 @@@ mvn-settings: 'aai-logging-service-settings' files: '**' archive-artifacts: '' - - project: - name: aai-logging-service-releases - project-name: 'aai-logging-service' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - project: 'aai/logging-service' - stream: - - 'release-1.0.0': - branch: 'release-1.0.0' - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-logging-service-settings' - files: '**' - archive-artifacts: '' + - project: name: aai-logging-service-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/logging-service' project-name: 'aai-logging-service' diff --combined jjb/aai/aai-model-loader.yaml index d03542092,62c3d94a0..e13635477 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@@ -6,10 -6,13 +6,13 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' + disabled: true + project: 'aai/model-loader' stream: - 'master': @@@ -18,30 -21,10 +21,11 @@@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - - project: - name: aai-model-loader-releases - project-name: 'aai-model-loader' - jobs: - - gerrit-maven-clm: - - '{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: 'pom.xml' - mvn-goals: 'docker:build' - project: 'aai/model-loader' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-model-loader-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g - project: name: aai-model-loader-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/model-loader' project-name: 'aai-model-loader' diff --combined jjb/aai/aai-resources.yaml index 8926fb3af,5da41ea6c..319b54473 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@@ -6,13 -6,16 +6,16 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' + disabled: true - '{project-name}-{stream}-aai-docker-java-version-daily': pom: 'aai-resources/pom.xml' mvn-goals: 'docker:build docker:push' + disabled: true project: 'aai/resources' stream: @@@ -22,34 -25,10 +25,11 @@@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - - project: - name: aai-resources-amsterdam - project-name: 'aai-resources' - jobs: - - gerrit-maven-clm: - - '{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-name}-{stream}-aai-docker-java-version-daily': - pom: 'aai-resources/pom.xml' - mvn-goals: 'docker:build docker:push' - - project: 'aai/resources' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-resources-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g - project: name: aai-resources-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/resources' project-name: 'aai-resources' diff --combined jjb/aai/aai-rest-client.yaml index 014617659,b0e0d0256..2f3d96a4e --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@@ -6,7 -6,8 +6,8 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true project: 'aai/rest-client' stream: - 'master': @@@ -14,26 -15,10 +15,11 @@@ mvn-settings: 'aai-rest-client-settings' files: '**' archive-artifacts: '' - - project: - name: aai-rest-client-releases - project-name: 'aai-rest-client' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - project: 'aai/rest-client' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-rest-client-settings' - files: '**' - archive-artifacts: '' - project: name: aai-rest-client-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/rest-client' project-name: 'aai-rest-client' diff --combined jjb/aai/aai-router-core-service.yaml index a049a2d72,7f406977b..35fc82f7e --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@@ -6,7 -6,8 +6,8 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true project: 'aai/router-core' stream: - 'master': @@@ -14,26 -15,10 +15,11 @@@ mvn-settings: 'aai-router-core-settings' files: '**' archive-artifacts: '' - - project: - name: aai-router-core-releases - project-name: 'aai-router-core' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - project: 'aai/router-core' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-router-core-settings' - files: '**' - archive-artifacts: '' - project: name: aai-router-core-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/router-core' project-name: 'aai-router-core' diff --combined jjb/aai/aai-sparky-be.yaml index 0605c3864,1b6dffc2e..3901d438e --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@@ -6,10 -6,12 +6,12 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' + disabled: true project: 'aai/sparky-be' stream: - 'master': @@@ -17,29 -19,10 +19,11 @@@ mvn-settings: 'aai-sparky-be-settings' files: '**' archive-artifacts: '' - - project: - name: aai-sparky-be-releases - project-name: 'aai-sparky-be' - jobs: - - gerrit-maven-clm: - - '{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: 'pom.xml' - mvn-goals: 'docker:build' - project: 'aai/sparky-be' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-sparky-be-settings' - files: '**' - archive-artifacts: '' - project: name: aai-sparky-be-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/sparky-be' project-name: 'aai-sparky-be' diff --combined jjb/aai/aai-sparky-fe.yaml index 756cee8ee,f3e3e9404..3f46ae14b --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@@ -7,13 -7,12 +7,12 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true project: 'aai/sparky-fe' stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'aai-sparky-fe-settings' files: '**' archive-artifacts: '' @@@ -21,7 -20,6 +20,7 @@@ name: aai-sparky-fe-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/sparky-fe' project-name: 'aai-sparky-fe' diff --combined jjb/aai/aai-traversal.yaml index 76db11286,6695cdf75..e3625ad2d --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@@ -6,13 -6,16 +6,16 @@@ - gerrit-maven-clm: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily': + disabled: true - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' + disabled: true - '{project-name}-{stream}-aai-docker-java-version-daily': pom: 'aai-traversal/pom.xml' mvn-goals: 'docker:build docker:push' + disabled: true project: 'aai/traversal' stream: @@@ -22,34 -25,10 +25,11 @@@ files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g - - project: - name: aai-traversal-amsterdam - project-name: 'aai-traversal' - jobs: - - gerrit-maven-clm: - - '{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-name}-{stream}-aai-docker-java-version-daily': - pom: 'aai-traversal/pom.xml' - mvn-goals: 'docker:build docker:push' - - project: 'aai/traversal' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-traversal-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g - project: name: aai-traversal-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g project: 'aai/traversal' project-name: 'aai-traversal'