From 1ee4c6c203da440a84d89ff3ec9a7cbd760c2516 Mon Sep 17 00:00:00 2001 From: jimmydot Date: Wed, 14 Feb 2018 18:19:00 -0500 Subject: Remove amsterdam jobs and disable daily Issue-ID: AAI-777 Change-Id: I055802953451461757e2cf14c7a9a2bc7a75c5a8 Signed-off-by: Jimmy Forsyth --- jjb/aai/aai-aai-common.yaml | 24 +++--------------------- jjb/aai/aai-babel.yaml | 4 +++- jjb/aai/aai-champ.yaml | 4 +++- jjb/aai/aai-data-router.yaml | 22 +++------------------- jjb/aai/aai-esr-gui.yaml | 2 -- jjb/aai/aai-esr-server.yaml | 20 -------------------- jjb/aai/aai-event-client.yaml | 6 ++++-- jjb/aai/aai-logging-service.yaml | 21 +++------------------ jjb/aai/aai-model-loader.yaml | 24 ++++-------------------- jjb/aai/aai-resources.yaml | 28 ++++------------------------ jjb/aai/aai-rest-client.yaml | 18 ++---------------- jjb/aai/aai-router-core-service.yaml | 18 ++---------------- jjb/aai/aai-search-data-service.yaml | 22 +++------------------- jjb/aai/aai-sparky-be.yaml | 22 +++------------------- jjb/aai/aai-sparky-fe.yaml | 5 ++--- jjb/aai/aai-traversal.yaml | 28 ++++------------------------ 16 files changed, 43 insertions(+), 225 deletions(-) diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 31b67c6fe..9faf073e4 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -6,10 +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,26 +21,6 @@ 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: diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 3e16cf5fa..5124ffe64 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -6,10 +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': diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index 842a49ec2..3547d88d6 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -6,10 +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: diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 3606b6831..a684a40ae 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -6,10 +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,24 +19,6 @@ 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: diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index b870687fb..89d02f03a 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -13,8 +13,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'aai-esr-gui-settings' files: '**' archive-artifacts: '' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 612fe9431..6cacb03cb 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -19,26 +19,6 @@ 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: diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 3f755e50c..c47d72fa4 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -6,11 +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: 'aai/event-client' stream: - 'master': branch: 'master' mvn-settings: 'aai-event-client-settings' files: '**' - archive-artifacts: '' \ No newline at end of file + archive-artifacts: '' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 691796019..5849d1696 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -6,7 +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,23 +15,7 @@ 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: diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 0f7b1ecc6..62c3d94a0 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -6,10 +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,25 +21,6 @@ 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: diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index cd080b3fc..5da41ea6c 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -6,13 +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,29 +25,6 @@ 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: diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 848a22279..b0e0d0256 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -6,7 +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,21 +15,6 @@ 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: diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index e159e7f20..7f406977b 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -6,7 +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,21 +15,6 @@ 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: diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index d86ea2e9b..a8eaefd1a 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -6,10 +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/search-data-service' stream: - 'master': @@ -17,21 +19,3 @@ mvn-settings: 'aai-search-data-service-settings' files: '**' archive-artifacts: '' -- project: - name: aai-search-data-service-releases - project-name: 'aai-search-data-service' - 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/search-data-service' - stream: - - 'amsterdam': - branch: 'amsterdam' - mvn-settings: 'aai-search-data-service-settings' - files: '**' - archive-artifacts: '' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index d2d0e4c16..1b6dffc2e 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -6,10 +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,24 +19,6 @@ 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: diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 2dab4d5e4..f3e3e9404 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -7,13 +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: '' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index cecc7ae30..6695cdf75 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -6,13 +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,29 +25,6 @@ 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: -- cgit 1.2.3-korg