From: Jimmy Forsyth Date: Fri, 15 Feb 2019 23:04:30 +0000 (-0500) Subject: Switch sonar and clm jobs to master X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e8e9f7555ff5fa8c86cecd72d68d27d5b0bbc90c;p=ci-management.git Switch sonar and clm jobs to master Issue-ID: AAI-2158 Change-Id: I6a5952ea76e27cdd7e94019aa6d94d51d2a555f7 Signed-off-by: Jimmy Forsyth --- diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 4dddda5a3..85f27f339 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -32,7 +32,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-aai-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,7 +47,7 @@ project: 'aai/aai-common' project-name: 'aai-aai-common' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index fc886cf6b..d0a5c87aa 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/babel' project-name: 'aai-babel' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-babel-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,8 +48,8 @@ project: 'aai/babel' project-name: 'aai-babel' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-babel-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index 0e90a12b7..b9b9dfb67 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -31,7 +31,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/cacher' project-name: 'aai-cacher' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-cacher-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -45,8 +45,8 @@ project: 'aai/cacher' project-name: 'aai-cacher' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index a3befbb0a..c647772a0 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -35,6 +35,6 @@ project: 'aai/chameleon' project-name: 'aai-chameleon' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-chameleon-settings' diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index c83335b78..b69e8e0ee 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/champ' project-name: 'aai-champ' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-champ-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,6 +48,6 @@ project: 'aai/champ' project-name: 'aai-champ' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-champ-settings' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 870f9bcbe..dd15d46b4 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -34,7 +34,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/data-router' project-name: 'aai-data-router' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-data-router-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,6 +47,6 @@ project: 'aai/data-router' project-name: 'aai-data-router' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-data-router-settings' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index c473cdab0..1184bef14 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -36,6 +36,6 @@ project: 'aai/esr-gui' project-name: 'aai-esr-gui' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-esr-gui-settings' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 0d8c99089..5527e7bc9 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -49,6 +49,6 @@ project: 'aai/esr-server' project-name: 'aai-esr-server' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-esr-server-settings' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index ad7da4cd8..4b98a5a0d 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -43,6 +43,6 @@ project: 'aai/event-client' project-name: 'aai-event-client' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-event-client-settings' diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index fefd7c901..1b4788173 100644 --- a/jjb/aai/aai-gallifrey.yaml +++ b/jjb/aai/aai-gallifrey.yaml @@ -28,6 +28,6 @@ project: 'aai/gallifrey' project-name: 'aai-gallifrey' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-gallifrey-settings' diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index bb460182c..f8d3e71f1 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/gizmo' project-name: 'aai-gizmo' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-gizmo-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,6 +48,6 @@ project: 'aai/gizmo' project-name: 'aai-gizmo' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-gizmo-settings' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 7e608e190..0c56aa4f0 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -37,7 +37,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/graphadmin' project-name: 'aai-graphadmin' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-graphadmin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -51,7 +51,7 @@ project: 'aai/graphadmin' project-name: 'aai-graphadmin' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 566ae9089..436d6d1af 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -43,6 +43,6 @@ project: 'aai/logging-service' project-name: 'aai-logging-service' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-logging-service-settings' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index b9382be24..c1ed8c3f5 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/model-loader' project-name: 'aai-model-loader' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-model-loader-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,6 +48,6 @@ project: 'aai/model-loader' project-name: 'aai-model-loader' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-model-loader-settings' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 30338af63..9f86ab7b8 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -37,7 +37,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/resources' project-name: 'aai-resources' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-resources-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -51,7 +51,7 @@ project: 'aai/resources' project-name: 'aai-resources' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 025fc7fc2..4a69a5db2 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -43,6 +43,6 @@ project: 'aai/rest-client' project-name: 'aai-rest-client' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-rest-client-settings' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index d7e2e22a3..43127d19f 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -43,6 +43,6 @@ project: 'aai/router-core' project-name: 'aai-router-core' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-router-core-settings' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index e4c4bd1a9..56f7926fd 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/resources' project-name: 'aai-schema-service' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-schema-service-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index bd44eb4fa..abf9bf1c3 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -34,7 +34,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/search-data-service' project-name: 'aai-search-data-service' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-search-data-service-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,6 +47,6 @@ project: 'aai/search-data-service' project-name: 'aai-search-data-service' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-search-data-service-settings' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 2a9c88631..015f047f4 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -34,7 +34,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/sparky-be' project-name: 'aai-sparky-be' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-sparky-be-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,6 +47,6 @@ project: 'aai/sparky-be' project-name: 'aai-sparky-be' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-sparky-be-settings' diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index 5dd744b34..2198a7b69 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/spike' project-name: 'aai-spike' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-spike-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -47,6 +47,6 @@ project: 'aai/spike' project-name: 'aai-spike' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-spike-settings' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 83acb9e26..ef4217df3 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -37,7 +37,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/traversal' project-name: 'aai-traversal' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-traversal-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -51,7 +51,7 @@ project: 'aai/traversal' project-name: 'aai-traversal' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index ea7319c71..79a89e36e 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -35,7 +35,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/validation' project-name: 'aai-validation' - branch: 'casablanca' + branch: 'master' mvn-settings: 'aai-validation-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -48,7 +48,7 @@ project: 'aai/validation' project-name: 'aai-validation' stream: - - 'casablanca': - branch: 'casablanca' + - 'master': + branch: 'master' mvn-settings: 'aai-validation-settings'