diff options
Diffstat (limited to 'jjb')
121 files changed, 1219 insertions, 523 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 5330020b9..4dddda5a3 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -46,6 +46,8 @@ build-node: ubuntu1604-builder-4c-4g project: 'aai/aai-common' project-name: 'aai-aai-common' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 4fc62cb31..fc886cf6b 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -47,7 +47,9 @@ nexus-iq-namespace: 'onap-' project: 'aai/babel' project-name: 'aai-babel' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' 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 38e4c4be1..0e90a12b7 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -44,7 +44,9 @@ nexus-iq-namespace: 'onap-' project: 'aai/cacher' project-name: 'aai-cacher' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml index c550684fc..a3befbb0a 100644 --- a/jjb/aai/aai-chameleon.yaml +++ b/jjb/aai/aai-chameleon.yaml @@ -34,5 +34,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/chameleon' project-name: 'aai-chameleon' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-chameleon-settings' diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml index ea1cb469e..c83335b78 100644 --- a/jjb/aai/aai-champ.yaml +++ b/jjb/aai/aai-champ.yaml @@ -47,5 +47,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/champ' project-name: 'aai-champ' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-champ-settings' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index e28922fe6..870f9bcbe 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -46,5 +46,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/data-router' project-name: 'aai-data-router' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-data-router-settings' diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index 11c1d9fee..c473cdab0 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -35,5 +35,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/esr-gui' project-name: 'aai-esr-gui' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-esr-gui-settings' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 26ab6feed..0d8c99089 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -48,5 +48,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/esr-server' project-name: 'aai-esr-server' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-esr-server-settings' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 0b6efb861..ad7da4cd8 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -42,5 +42,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/event-client' project-name: 'aai-event-client' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-event-client-settings' diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index 2623d2374..fefd7c901 100644 --- a/jjb/aai/aai-gallifrey.yaml +++ b/jjb/aai/aai-gallifrey.yaml @@ -27,5 +27,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/gallifrey' project-name: 'aai-gallifrey' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-gallifrey-settings' diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index 6fa3d576e..bb460182c 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -47,5 +47,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/gizmo' project-name: 'aai-gizmo' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-gizmo-settings' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index f7307e809..7e608e190 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -50,6 +50,8 @@ nexus-iq-namespace: 'onap-' project: 'aai/graphadmin' project-name: 'aai-graphadmin' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml new file mode 100644 index 000000000..5464086af --- /dev/null +++ b/jjb/aai/aai-graphgraph.yaml @@ -0,0 +1,20 @@ +--- +- project: + name: aai-graphgraph + project-name: aai-graphgraph + views: + - project-view + +- project: + name: aai-graphgraph-master + project-name: 'aai-graphgraph' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + project: 'aai/graphgraph' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-graphgraph-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index c9be3f531..566ae9089 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -42,5 +42,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/logging-service' project-name: 'aai-logging-service' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-logging-service-settings' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index bce3defa6..b9382be24 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -47,5 +47,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/model-loader' project-name: 'aai-model-loader' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-model-loader-settings' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index a1d9cbc43..30338af63 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -50,6 +50,8 @@ nexus-iq-namespace: 'onap-' project: 'aai/resources' project-name: 'aai-resources' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' 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 342564367..025fc7fc2 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -42,5 +42,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/rest-client' project-name: 'aai-rest-client' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' 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 19654c9f4..d7e2e22a3 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -42,5 +42,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/router-core' project-name: 'aai-router-core' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-router-core-settings' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml new file mode 100644 index 000000000..e4c4bd1a9 --- /dev/null +++ b/jjb/aai/aai-schema-service.yaml @@ -0,0 +1,55 @@ +--- +- project: + name: aai-schema-service-project-view + project-name: aai-schema-service + views: + - project-view + +- project: + name: aai-schema-service + project-name: 'aai-schema-service' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'aai-schema-service/pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + build-node: ubuntu1604-docker-8c-8g + project: 'aai/schema-service' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-schema-service-settings' + mvn-version: 'mvn35' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: aai-schema-service-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'aai/resources' + project-name: 'aai-schema-service' + branch: 'casablanca' + mvn-settings: 'aai-schema-service-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-version: 'mvn35' + +- project: + name: aai-schema-service-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'aai/resources' + project-name: 'aai-schema-service' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-schema-service-settings' + mvn-version: 'mvn35' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index dd4f29c91..bd44eb4fa 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -46,5 +46,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/search-data-service' project-name: 'aai-search-data-service' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-search-data-service-settings' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 4e43985fc..2a9c88631 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -46,5 +46,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/sparky-be' project-name: 'aai-sparky-be' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-sparky-be-settings' diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index ec4f61b2b..5dd744b34 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -46,5 +46,7 @@ nexus-iq-namespace: 'onap-' project: 'aai/spike' project-name: 'aai-spike' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-spike-settings' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index e7f9594d6..83acb9e26 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -50,6 +50,8 @@ nexus-iq-namespace: 'onap-' project: 'aai/traversal' project-name: 'aai-traversal' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index 8c6776be4..ea7319c71 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -1,5 +1,11 @@ --- - project: + name: aai-validation-project-view + project-name: aai-validation + views: + - project-view + +- project: name: aai-validation project-name: 'aai-validation' jobs: @@ -41,5 +47,8 @@ nexus-iq-namespace: 'onap-' project: 'aai/validation' project-name: 'aai-validation' - branch: 'casablanca' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'aai-validation-settings' + diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index fba98f97d..25a0ce6af 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -43,13 +43,3 @@ mvn-profile: docker build-node: queue-docker-4c-4g -- project: - name: appc-deployment-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'appc/deployment' - project-name: 'appc-deployment' - branch: 'master' - mvn-settings: 'appc-deployment-settings' - diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 8854e3117..985053293 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -49,7 +49,11 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/apps' project-name: 'ccsdk-apps' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-apps-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml new file mode 100644 index 000000000..f1efc6193 --- /dev/null +++ b/jjb/ccsdk/cds.yaml @@ -0,0 +1,65 @@ +--- +- project: + name: ccsdk-cds + project-name: 'ccsdk-cds' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'ccsdk/cds' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-cds-settings' + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: ccsdk-cds-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'ccsdk/cds' + project-name: 'ccsdk-cds' + branch: 'master' + mvn-settings: 'ccsdk-cds-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-cds-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'ccsdk/cds' + project-name: 'ccsdk-cds' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-cds-settings' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: ccsdk-cds-docker + project-name: 'ccsdk-cds' + jobs: + - 'docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' + project: 'ccsdk/cds' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-cds-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker + build-node: queue-docker-4c-4g diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 87e273984..8c44fb5d2 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -45,7 +45,11 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/distribution' project-name: 'ccsdk-distribution' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-distribution-settings' build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index d988ffbc0..5a9c8ce5e 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -43,6 +43,10 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/features' project-name: 'ccsdk-features' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-features-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index a08717109..0cebc4d1e 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -29,7 +29,11 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/parent' project-name: 'ccsdk-parent' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-parent-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 96fb33fc2..8610819b0 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -43,7 +43,11 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/platform/plugins' project-name: 'ccsdk-platform-plugins' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-platform-plugins-settings' build-node: centos7-redis-4c-4g diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index e1d47f072..b880dcc0f 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -43,7 +43,11 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/sli/adaptors' project-name: 'ccsdk-sli-adaptors' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-sli-adaptors-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 4caa3dded..fee7df8ad 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -43,7 +43,11 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/sli/core' project-name: 'ccsdk-sli-core' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-sli-core-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 857b375e5..5c85642f6 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -43,7 +43,11 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/sli/northbound' project-name: 'ccsdk-sli-northbound' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-sli-northbound-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index cf96591a4..27f06c9fc 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -42,6 +42,10 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/sli/plugins' project-name: 'ccsdk-sli-plugins' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-sli-plugins-settings' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 23394b648..b0b011f07 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -29,6 +29,10 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/utils' project-name: 'ccsdk-utils' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-utils-settings' diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 4ad5840ca..5c90a17ee 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -17,4 +17,4 @@ branch: 'master' build-timeout: '60' build-node: 'centos7-builder-2c-1g' - jjb-version: 2.2.1 + jjb-version: 2.9.1 diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index fd81ece3f..b2cefd290 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -28,6 +28,24 @@ build-node: ubuntu1604-builder-4c-4g - project: + name: cli-arm64 + project-name: 'cli-arm64' + jobs: + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'deployment/docker/pom.xml' + mvn-goals: 'docker:build' + docker-image-name: 'onap/cli' + + project: 'cli' + stream: + - 'master': + branch: 'master' + mvn-settings: 'cli-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + +- project: name: cli-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml new file mode 100644 index 000000000..dea056ac0 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -0,0 +1,46 @@ +--- +- project: + name: dcaegen2-services-datafile + # job template iterators + project-name: 'dcaegen2-services-pm-mapper' + stream: + - 'master': + branch: 'master' + # apply to all jobs + project: 'dcaegen2/services/pm-mapper' + mvn-settings: 'dcaegen2-services-pm-mapper-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + jobs: + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-verify-java': + mvn-goals: 'clean install' + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean deploy' + +- project: + name: dcaegen2-services-pm-mapper-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/services/pm-mapper' + project-name: 'dcaegen2-services-pm-mapper' + branch: 'master' + mvn-settings: 'dcaegen2-services-pm-mapper-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-pm-mapper-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/services/pm-mapper + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-pm-mapper' + branch: 'master' + mvn-settings: 'dcaegen2-services-pm-mapper-settings' diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml index b111a7c5a..3a54b4263 100644 --- a/jjb/dmaap/dmaap-datarouter-csit.yaml +++ b/jjb/dmaap/dmaap-datarouter-csit.yaml @@ -14,4 +14,7 @@ - 'dr-suite': trigger_jobs: - '{project-name}-{stream}-docker-java-shell-daily' + - 'ssl-dr-suite': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' robot-options: '' diff --git a/jjb/doc/doc-post-rtd.sh b/jjb/doc/doc-post-rtd.sh index 5c8d8c52f..78b8d0b56 100644 --- a/jjb/doc/doc-post-rtd.sh +++ b/jjb/doc/doc-post-rtd.sh @@ -6,4 +6,7 @@ else fi # shellcheck disable=SC1083 -curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/{rtdproject} +curl -X POST \ + -d "branches=$RTD_BUILD_VERSION" \ + -d "token=$DOCS_RTD_TOKEN" \ + https://readthedocs.org/api/v2/webhook/{rtdproject} diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml index 77cea696f..234a767ca 100644 --- a/jjb/doc/doc-templates-rtd.yaml +++ b/jjb/doc/doc-templates-rtd.yaml @@ -134,6 +134,10 @@ wrappers: - infra-wrappers: build-timeout: '{build-timeout}' + - credentials-binding: + - text: + credential-id: docs-token + variable: DOCS_RTD_TOKEN triggers: - gerrit: diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 6986dffd2..8515d7378 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -14,7 +14,7 @@ - '{project-name}-{stream}-merge-rtd' project: 'doc' - rtdproject: 'onap' + rtdproject: 'onap/58810/' mvn-settings: 'doc-settings' stream: - master: diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 5e922566f..bdd15418d 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -16,12 +16,13 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'externalapi/nbi' stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' files: '**' archive-artifacts: '' @@ -35,6 +36,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' + build-node: 'ubuntu1604-docker-arm64-4c-2g' project: 'externalapi/nbi' stream: - 'master': @@ -42,7 +44,6 @@ mvn-settings: 'externalapi-nbi-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - project: name: externalapi-nbi-clm @@ -51,7 +52,11 @@ nexus-iq-namespace: 'onap-' project: 'externalapi/nbi' project-name: 'externalapi-nbi' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' - project: @@ -62,7 +67,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'externalapi/nbi' project-name: 'externalapi-nbi' - branch: 'master' + branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index f352030ae..2951d351d 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1154,7 +1154,7 @@ name: '{project-name}-{stream}-docker-version-java-daily' id: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + node: '{build-node}' disabled: '{disabled}' properties: - infra-properties: diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index df94683f0..e245103b9 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -54,6 +54,60 @@ - lf-infra-publish - job-template: + name: '{project-name}-arm64-{stream}-verify-csit-{functionality}' + disabled: false + + project-type: freestyle + build-node: 'ubuntu1604-docker-arm64-4c-2g' + node: '{build-node}' + + properties: + - lf-infra-properties: + project: 'integration/csit' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: 'integration/csit' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-plan: + test-plan: 'plans/{project-name}/{functionality}' + - integration-test-options: + test-options: '{robot-options}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: 'integration/csit' + branch: '{branch}' + files: '**/{project-name}/**' + + builders: + - integration-install-robotframework + - inject: + properties-file: 'env.properties' + - integration-run-test + + publishers: + - integration-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + +- job-template: name: '{project-name}-{stream}-verify-csit-{functionality}-testng' disabled: false @@ -130,6 +184,82 @@ - lf-infra-publish - job-template: + name: '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng' + disabled: false + + project-type: freestyle + build-node: 'ubuntu1604-docker-arm64-4c-2g' + node: '{build-node}' + + properties: + - lf-infra-properties: + project: 'integration/csit' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: 'integration/csit' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-plan: + test-plan: 'plans/{project-name}/{functionality}' + - integration-test-options: + test-options: '{robot-options}' + - html-publisher-dir: + html-dir: '{html-dir}' + - html-publisher-files: + html-files: '{html-files}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: 'integration/csit' + branch: '{branch}' + files: '**/{project-name}/**' + + builders: + - integration-install-robotframework + - inject: + properties-file: 'env.properties' + - integration-run-test + + publishers: + - testng: + pattern: archives/testng-results.xml + escape-test-description: true + escape-exception-msg: true + show-failed-builds: true + unstable-on-skipped-tests: false + failure-on-failed-test-config: false + - junit: + results: archives/testng-results.xml + health-scale-factor: 1.0 + allow-empty-results: true + - integration-robot: + unstable-if: 0.0 + pass-if: 100.0 + - html-publisher: + allow-missing: true + dir: '{html-dir}' + files: '{html-files}' + keep-all: false + link-to-last-build: false + name: ExtentReport + - lf-infra-publish + +- job-template: name: '{project-name}-{stream}-csit-{functionality}' disabled: false @@ -187,6 +317,63 @@ - lf-infra-publish - job-template: + name: '{project-name}-arm64-{stream}-csit-{functionality}' + disabled: false + + project-type: freestyle + build-node: 'ubuntu1604-docker-arm64-4c-2g' + node: '{build-node}' + + properties: + - lf-infra-properties: + project: 'integration/csit' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: 'integration/csit' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-plan: + test-plan: 'plans/{project-name}/{functionality}' + - integration-test-options: + test-options: '{robot-options}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: 'integration/csit' + branch: '{branch}' + files: '**/{project-name}/**' + - timed: '@daily' + - reverse: + jobs: '{obj:trigger_jobs}' + + builders: + - integration-install-robotframework + - inject: + properties-file: 'env.properties' + - integration-run-test + + publishers: + - integration-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + +- job-template: name: '{project-name}-{stream}-csit-{functionality}-testng' disabled: false @@ -264,3 +451,82 @@ link-to-last-build: false name: ExtentReport - lf-infra-publish + +- job-template: + name: '{project-name}-arm64-{stream}-csit-{functionality}-testng' + disabled: false + + project-type: freestyle + build-node: 'ubuntu1604-docker-arm64-4c-2g' + node: '{build-node}' + + properties: + - lf-infra-properties: + project: 'integration/csit' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: 'integration/csit' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-plan: + test-plan: 'plans/{project-name}/{functionality}' + - integration-test-options: + test-options: '{robot-options}' + - html-publisher-dir: + html-dir: '{html-dir}' + - html-publisher-files: + html-files: '{html-files}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: 'integration/csit' + branch: '{branch}' + files: '**/{project-name}/**' + - timed: '@daily' + - reverse: + jobs: '{obj:trigger_jobs}' + + builders: + - integration-install-robotframework + - inject: + properties-file: 'env.properties' + - integration-run-test + + publishers: + - integration-robot: + unstable-if: 0.0 + pass-if: 100.0 + - testng: + pattern: archives/testng-results.xml + escape-test-description: true + escape-exception-msg: true + show-failed-builds: true + unstable-on-skipped-tests: false + failure-on-failed-test-config: false + - junit: + results: archives/testng-results.xml + health-scale-factor: 1.0 + allow-empty-results: true + - html-publisher: + allow-missing: true + dir: '{html-dir}' + files: '{html-files}' + keep-all: false + link-to-last-build: false + name: ExtentReport + - lf-infra-publish diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index f41d0a793..cb253c666 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -35,5 +35,9 @@ nexus-iq-namespace: 'onap-' project: integration project-name: 'integration' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'integration-settings' diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml index 12acf34b1..7fbbe616f 100644 --- a/jjb/lab/lab.yaml +++ b/jjb/lab/lab.yaml @@ -4,15 +4,9 @@ jobs: - 'lab-{job-name}' job-name: - - "windriver-heat-daily": - job-desc: "Heat-based deployment into Wind River lab Integration-HEAT-Daily tenant" - "windriver-oom-daily": job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Daily tenant" - - "windriver-heat-staging-daily": - job-desc: "Heat-based deployment into Wind River lab Integration-HEAT-Staging-Daily tenant" - "windriver-oom-staging-daily": job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Staging-Daily tenant" - - "tlab-heat-daily": - job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant" - "tlab-oom-daily": job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant" diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml index 010383d51..c5b69ba8e 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml @@ -25,6 +25,25 @@ maven-version: 'mvn35' - project: + name: logging-analytics-pomba-pomba-arm64-aai-context-builder + project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder + jobs: + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + project: logging-analytics/pomba/pomba-aai-context-builder + stream: + - 'master': + branch: 'master' + + mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + maven-version: 'mvn35' + +- project: name: logging-analytics-pomba-pomba-aai-context-builder-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml index 25bcfd16c..ad3af90d1 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml @@ -24,6 +24,26 @@ maven-version: 'mvn35' - project: + name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder + project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder + jobs: + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + project: logging-analytics/pomba/pomba-network-discovery-context-builder + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' + mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + maven-version: 'mvn35' + +- project: name: logging-analytics-pomba-pomba-network-discovery-context-builder-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml index fb9730158..685b4c6ca 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml @@ -24,6 +24,24 @@ maven-version: 'mvn35' - project: + name: logging-analytics-pomba-pomba-arm64-sdc-context-builder + project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder + jobs: + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + project: logging-analytics/pomba/pomba-sdc-context-builder + stream: + - 'master': + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + maven-version: 'mvn35' + +- project: name: logging-analytics-pomba-pomba-sdc-context-builder-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml index a65f11d2b..3525bb073 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml @@ -23,6 +23,23 @@ build-node: ubuntu1604-builder-4c-4g - project: + name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder + project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder + jobs: + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + project: logging-analytics/pomba/pomba-sdnc-context-builder + stream: + - 'master': + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + +- project: name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 965c0fb4d..dcbd07a54 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -16,6 +16,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'logging-analytics' stream: - 'master': @@ -28,6 +29,25 @@ build-node: ubuntu1604-builder-4c-4g - project: + name: logging-analytics-arm64 + project-name: 'logging-analytics-arm64' + jobs: + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + project: 'logging-analytics' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' + mvn-settings: 'logging-analytics-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + +- project: name: logging-analytics-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 025a91fab..26842cb18 100755 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -9,8 +9,10 @@ chmod 755 ./newton/docker/*.* chmod 755 ./ocata/docker/*.* chmod 755 ./windriver/docker/*.* chmod 755 ./pike/docker/*.* +chmod 755 ./starlingx/docker/*.* ./newton/docker/build_image.sh ./ocata/docker/build_image.sh ./windriver/docker/build_image.sh ./pike/docker/build_image.sh +./starlingx/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index 1c818d228..520a97aec 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -25,7 +25,29 @@ build-node: ubuntu1604-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1604-builder-4c-2g + +- project: + name: multicloud-azure-arm64-java + project-name: 'multicloud-azure-arm64' + project: 'multicloud/azure' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-azure-settings' + subproject: + - 'azure': + pom: 'azure/pom.xml' + pattern: 'azure/**' + jobs: + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-azure-docker-image.sh' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g - project: name: multicloud-azure-sonar diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index fd3d0f2df..d59d92ed0 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -28,6 +28,28 @@ build-node: ubuntu1604-builder-4c-4g - project: + name: multicloud-framework-arm64-java + project-name: 'multicloud-framework-arm64' + project: 'multicloud/framework' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-framework-settings' + subproject: + - 'multivimbroker': + pom: 'multivimbroker/pom.xml' + pattern: 'multivimbroker/**' + jobs: + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-framework-docker-image.sh' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + +- project: name: multicloud-framework-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 711539b4c..4131c7f14 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -23,3 +23,25 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: multicloud-k8s-arm64 + project-name: 'multicloud-k8s-arm64' + path: 'src/k8splugin' + golangver: 'golang111' + jobs: + - '{project-name}-{stream}-docker-golang-shell-daily': + script: + !include-raw-escape: 'build-multicloud-k8s-docker-image.sh' + project: 'multicloud/k8s' + subproject: + - validation-scripts: + path: '.' + pattern: '**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-k8s-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml index 404577d48..374b27fa0 100644 --- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml @@ -8,8 +8,12 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: + - 'multicloud-openstack-master-docker-java-version-shell-daily' + - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' - 'hpa-discovery': - trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: + - 'multicloud-openstack-master-docker-java-version-shell-daily' + - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml index f61f66dd8..c8a6cd88b 100644 --- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml @@ -8,6 +8,8 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: + - 'multicloud-openstack-master-docker-java-version-shell-daily' + - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml new file mode 100644 index 000000000..364bf01fd --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-starlingx-csit.yaml @@ -0,0 +1,12 @@ +--- +- project: + name: multicloud-openstack-starlingx-csit + jobs: + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-starlingx' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml index 6d1fc12fe..4c56a372d 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml @@ -8,6 +8,8 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' + trigger_jobs: + - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' + - 'multicloud-openstack-vmware-arm64-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index f63f2aa33..3c8be8acf 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -28,6 +28,28 @@ build-node: ubuntu1604-builder-4c-4g - project: + name: multicloud-openstack-vmware-arm64-java + project-name: 'multicloud-openstack-vmware-arm64' + project: 'multicloud/openstack/vmware' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' + subproject: + - 'vio': + pom: 'vio/pom.xml' + pattern: 'vio/**' + jobs: + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh' + build-node: ubuntu1604-docker-arm64-4c-2g + files: '**' + archive-artifacts: '' + +- project: name: multicloud-openstack-vmware-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml index e3b969cdf..6718c4dc3 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml @@ -24,3 +24,25 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: multicloud-openstack-vmware-vesagent-arm64-java + project-name: 'multicloud-openstack-vmware-vesagent-arm64' + project: 'multicloud/openstack/vmware' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' + subproject: + - 'vesagent': + pom: 'vesagent/pom.xml' + pattern: 'vesagent/**' + jobs: + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh' + build-node: ubuntu1604-docker-arm64-4c-2g + files: '**' + archive-artifacts: '' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 71b7fd8bb..1dbac8366 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -38,6 +38,14 @@ path: 'pike' pattern: 'share/**' pom: 'pike/pom.xml' + - 'starlingx': + path: 'starlingx' + pattern: 'starlingx/**' + pom: 'starlingx/pom.xml' + - 'starlingx_share': + path: 'starlingx' + pattern: 'share/**' + pom: 'starlingx/pom.xml' - 'windriver': path: 'windriver' pattern: 'windriver/**' @@ -58,6 +66,24 @@ build-node: 'ubuntu1604-memcached-4c-4g' - project: + name: multicloud-openstack-arm64 + project-name: 'multicloud-openstack-arm64' + project: 'multicloud/openstack' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-settings' + jobs: + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' + build-node: ubuntu1604-docker-arm64-4c-2g + files: '**' + archive-artifacts: '' + +- project: name: multicloud-openstack-newton-sonar jobs: - gerrit-maven-sonar @@ -114,6 +140,20 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: + name: multicloud-openstack-starlingx-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack-starlingx' + branch: 'master' + mvn-params: '-f starlingx/pom.xml' + mvn-settings: 'multicloud-openstack-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: name: multicloud-openstack-clm jobs: - gerrit-maven-clm diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml index fc3ae6e1a..a86189221 100644 --- a/jjb/music/music-prom.yaml +++ b/jjb/music/music-prom.yaml @@ -10,6 +10,7 @@ docker-pom: 'pom.xml' mvn-profile: docker mvn-params: '-Dmaven.test.skip=true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'music/prom' stream: - 'master': diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index d6130caf8..698799662 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -16,6 +16,7 @@ docker-pom: 'pom.xml' mvn-profile: docker mvn-params: '-Dmaven.test.skip=true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'music' stream: - 'master': diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index e15e5689c..f9b23856e 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -62,5 +62,9 @@ project: optf/cmso project-name: 'optf-cmso' build-node: ubuntu1604-docker-8c-8g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'optf-cmso-settings' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 4550d1cda..d5fa4963c 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -75,5 +75,9 @@ nexus-iq-namespace: 'onap-' project: optf/has project-name: 'optf-has' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'optf-has-settings' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 36b169786..762b078d4 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -74,5 +74,9 @@ nexus-iq-namespace: 'onap-' project: optf/osdf project-name: 'optf-osdf' - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'optf-osdf-settings' diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 1fba9abf7..aa5d49bc8 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -48,7 +48,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/apex-pdp' stream: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index d4e80b993..d81fb7e96 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -24,7 +24,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: true + disabled: false project: 'policy/common' stream: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index c2ad0f723..6c529c89a 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -37,7 +37,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/distribution' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index ba8a08fd2..7661e5079 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -24,7 +24,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: true + disabled: false project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 367783742..5e34e7791 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -42,7 +42,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-pdp' stream: diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 70d9c3a9f..a52553818 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -42,7 +42,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/engine' stream: diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 33923c07f..42c93cf9c 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -21,3 +21,24 @@ branch: 'master' html-dir: 'archives' html-files: 'SDC_CI_Extent_Report.html' + +- project: + name: sdc-csit-arm64 + jobs: + - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng' + - '{project-name}-arm64-{stream}-csit-{functionality}-testng' + project-name: 'sdc' + stream: + - 'master': + branch: 'master' + functionality: + - 'sanity': + trigger_jobs: '{project-name}-{stream}-sdc-merge-java' + - 'nightly': + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' + - 'uiSanity': + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' + robot-options: '' + branch: 'master' + html-dir: 'archives' + html-files: 'SDC_CI_Extent_Report.html' diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index 61ce99c23..5c4385bc6 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -13,6 +13,7 @@ - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-DskipTests=true' @@ -28,6 +29,24 @@ build-timeout: 60 - project: + name: sdc-dcae-d-ci-arm64 + project-name: 'sdc-dcae-d-ci-arm64' + jobs: + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-DskipTests=true' + build-node: 'ubuntu1604-docker-arm64-4c-2g' + project: 'sdc/dcae-d/ci' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-dcae-d-ci-settings' + files: '**' + archive-artifacts: '' + build-timeout: 60 + +- project: name: sdc-dcae-ci-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index b3da135db..3630b4dde 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -7,6 +7,7 @@ - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-DskipTests=true' @@ -22,6 +23,25 @@ build-timeout: 60 - project: + name: sdc-dcae-d-dt-be-main-arm64 + project-name: 'sdc-dcae-d-dt-be-main-arm64' + jobs: + - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-arm64-4c-2g' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-DskipTests=true' + project: 'sdc/dcae-d/dt-be-main' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-dcae-d-dt-be-main-settings' + build-node: ubuntu1604-docker-arm64-4c-2g + files: '**' + archive-artifacts: '' + build-timeout: 60 + +- project: name: sdc-dcae-d-dt-be-main-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 82cccb5e9..6338c8c04 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -8,6 +8,7 @@ - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'server,docker' mvn-params: '-DskipTests=true' @@ -23,6 +24,25 @@ build-timeout: 60 - project: + name: sdc-dcae-d-dt-arm64 + project-name: 'sdc-dcae-d-dt-arm64' + build-node: ubuntu1604-docker-arm64-4c-2g + jobs: + - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-arm64-4c-2g' + docker-pom: 'pom.xml' + mvn-profile: 'server,docker' + mvn-params: '-DskipTests=true' + project: 'sdc/dcae-d/dt' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-dcae-d-dt-settings' + files: '**' + archive-artifacts: '' + build-timeout: 60 + +- project: name: sdc-dcae-d-dt-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index f463fe18f..9cc5de72c 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -8,6 +8,7 @@ - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-DskipTests=true' @@ -23,6 +24,24 @@ build-timeout: 60 - project: + name: sdc-dcae-d-fe-arm64 + project-name: 'sdc-dcae-d-fe-arm64' + jobs: + - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-arm64-4c-2g' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-DskipTests=true' + project: 'sdc/dcae-d/fe' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-dcae-d-fe-settings' + files: '**' + archive-artifacts: '' + build-timeout: 60 + +- project: name: sdc-dcae-d-fe-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 3242c407a..6b4a3b69a 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -22,6 +22,25 @@ mvn-profile: 'default' - project: + name: sdc-dcae-d-tosca-lab-arm64 + project-name: 'sdc-dcae-d-tosca-lab-arm64' + project: 'sdc/dcae-d/tosca-lab' + stream: + - 'master': + branch: 'master' + subproject: + - dcae-d-tosca-lab: + path: '.' + pattern: '**' + mvn-settings: 'sdc-dcae-d-tosca-lab-settings' + build-node: ubuntu1604-docker-arm64-4c-2g + jobs: + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' + docker-pom: 'pom.xml' + mvn-profile: 'default' + +- project: name: sdc-dcae-d-tosca-lab-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 41a04440a..3560a5f85 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -18,3 +18,20 @@ archive-artifacts: '' build-node: ubuntu1604-builder-8c-8g maven-version: 'mvn35' + +- project: + name: sdc-sdc-docker-base-arm64 + project-name: 'sdc-sdc-docker-base-arm64' + jobs: + - '{project-name}-{stream}-sdc-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'default' + project: 'sdc/sdc-docker-base' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-sdc-docker-base-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + maven-version: 'mvn35' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index db182f616..30497155e 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -30,6 +30,24 @@ maven-version: 'mvn35' - project: + name: sdc-sdc-workflow-designer-arm64 + project-name: 'sdc-sdc-workflow-designer-arm64' + jobs: + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' + project: 'sdc/sdc-workflow-designer' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-sdc-workflow-designer-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker + build-node: ubuntu1604-docker-arm64-4c-2g + maven-version: 'mvn35' + +- project: name: sdc-sdc-workflow-designer-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 493b239f7..7fe7985ac 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -36,6 +36,7 @@ - '{project-name}-{stream}-release-version-java-daily': mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' @@ -52,6 +53,29 @@ maven-version: 'mvn35' - project: + name: sdc-arm64 + project-name: 'sdc-arm64' + jobs: + - '{project-name}-{stream}-sdc-merge-java': + build-node: 'ubuntu1604-docker-arm64-4c-2g' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-arm64-4c-2g' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' + project: 'sdc' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-settings' + files: '**' + archive-artifacts: '' + maven-version: 'mvn35' + +- project: name: sdc-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 63fd0f324..5aad86bb8 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -71,5 +71,9 @@ project: sdnc/apps project-name: 'sdnc-apps' build-node: ubuntu1604-builder-4c-4g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-apps-settings' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index f725d1b57..190e0c2d6 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -45,5 +45,9 @@ project: sdnc/northbound project-name: 'sdnc-northbound' build-node: ubuntu1604-builder-4c-4g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-northbound-settings' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 8efe0f7fd..1dc289fa3 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -45,5 +45,9 @@ project: sdnc/oam project-name: 'sdnc-oam' build-node: ubuntu1604-builder-4c-4g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-oam-settings' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index a3b389abc..4d3e169c2 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -13,6 +13,7 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-version-java-daily': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' @@ -48,5 +49,9 @@ project: so project-name: 'so' build-node: ubuntu1604-builder-4c-4g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'so-settings' diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 030d8c5f8..bc1aef22f 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -14,18 +14,19 @@ !include-raw-escape: 'testsuite-docker.sh' project: 'testsuite' + extra-project1: 'testsuite/python-testing-utils' extra-branch1: 'master' - extra-refspec1: 'refs/heads/{branch}' + extra-refspec1: 'refs/heads/master' checkout-dir1: 'testsuite/eteutils' extra-project2: 'testsuite/heatbridge' extra-branch2: 'master' - extra-refspec2: 'refs/heads/{branch}' + extra-refspec2: 'refs/heads/master' checkout-dir2: 'testsuite/heatbridge' extra-project3: 'demo' - extra-branch3: 'master' + extra-branch3: '{branch}' extra-refspec3: 'refs/heads/{branch}' checkout-dir3: 'demo' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml index b53b05373..ba91dff33 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-gvnfm-vnflcm-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-gvnfm-vnflcm-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index ad451616e..f4037920e 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -32,28 +32,6 @@ build-node: centos7-redis-4c-4g - project: - name: vfc-gvnfm-vnflcm-java-arm64 - project-name: 'vfc-gvnfm-vnflcm-arm64' - project: 'vfc/gvnfm/vnflcm' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-gvnfm-vnflcm-settings' - subproject: - - 'lcm': - pom: 'lcm/pom.xml' - pattern: 'lcm/**' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-gvnfm-vnflcm-lcm-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml index 709a9575f..d15748925 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-gvnfm-vnfmgr-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-gvnfm-vnfmgr-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-gvnfm-vnfmgr-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 8ae9cbb97..502dc4102 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -26,28 +26,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: vfc-gvnfm-vnfmgr-java-arm64 - project-name: 'vfc-gvnfm-vnfmgr-arm64' - project: 'vfc/gvnfm/vnfmgr' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-gvnfm-vnfmgr-settings' - subproject: - - 'mgr': - pom: 'mgr/pom.xml' - pattern: 'mgr/**' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-gvnfm-vnfmgr-mgr-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml index b6d179cb2..3b76a2ab9 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-gvnfm-vnfres-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-gvnfm-vnfres-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-gvnfm-vnfres-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 124c64c4e..8d444bea6 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -27,24 +27,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: vfc-gvnfm-vnfres-java-arm64 - project-name: 'vfc-gvnfm-vnfres-arm64' - project: 'vfc/gvnfm/vnfres' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-gvnfm-vnfres-settings' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-gvnfm-vnfres-res-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml index 3055868ae..9affcfc05 100644 --- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml +++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml @@ -11,16 +11,3 @@ trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' - -- project: - name: vfc-nfvo-catalog-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-catalog-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-catalog-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index aec6e3d42..b88633eb5 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -28,24 +28,6 @@ build-node: centos7-redis-4c-4g - project: - name: vfc-nfvo-catalog-arm64 - project-name: 'vfc-nfvo-catalog-arm64' - project: 'vfc/nfvo/catalog' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-catalog-settings' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-catalog-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-nfvo-catalog-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 7f6912818..9e8570d5d 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -19,18 +19,3 @@ !include-raw-escape: 'build-nfvo-db-docker-image.sh' build-node: ubuntu1604-docker-8c-8g -- project: - name: vfc-nfvo-db-arm64 - project: 'vfc/nfvo/db' - project-name: 'vfc-nfvo-db-arm64' - mvn-settings: 'vfc-nfvo-db-settings' - stream: - - 'master': - branch: 'master' - build-node: ubuntu1604-docker-arm64-4c-2g - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-db-docker-image.sh' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml index 41e99f2cc..10accee31 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-nfvo-driver-ems-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-ems-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-driver-ems-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 4460bb669..6b9abf76e 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -27,28 +27,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: vfc-nfvo-driver-ems-java-arm64 - project-name: 'vfc-nfvo-driver-ems-arm64' - project: 'vfc/nfvo/driver/ems' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-ems-settings' - subproject: - - 'drv-ems-boco': - pom: 'ems/pom.xml' - pattern: 'ems/**' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-driver-ems-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-nfvo-driver-ems-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml index 96de3d728..6d089c75e 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-nfvo-driver-sfc-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-sfc-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-driver-sfc-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index d75377268..00fc285da 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -26,28 +26,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: vfc-nfvo-driver-sfc-arm64 - project-name: 'vfc-nfvo-driver-sfc-arm64' - project: 'vfc/nfvo/driver/sfc' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-sfc-settings' - subproject: - - 'driver-sfc-zte': - pom: 'zte/sfc-driver/pom.xml' - pattern: 'zte/sfc-driver/**' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-driver-zte-sfc-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-nfvo-driver-sfc-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml index 517fda3e9..93fb9ef68 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-nfvo-driver-vnfm-gvnfm-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-vnfm-gvnfm-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-driver-vnfm-gvnfm-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 904481ac9..a4e53e55c 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -27,28 +27,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: vfc-nfvo-driver-vnfm-gvnfm-java-arm64 - project-name: 'vfc-nfvo-driver-vnfm-gvnfm-arm64' - project: 'vfc/nfvo/driver/vnfm/gvnfm' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' - subproject: - - 'gvnfmadapter': - pom: 'gvnfmadapter/pom.xml' - pattern: 'gvnfmadapter/**' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-gvnfm-driver-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml index 98702f2e5..9be81e0d1 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-nfvo-driver-vnfm-svnfm-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-vnfm-svnfm-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-driver-vnfm-svnfm-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml index 072877763..6807afa39 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml @@ -19,20 +19,3 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: vfc-nfvo-driver-vnfm-svnfm-docker-arm64 - project-name: 'vfc-nfvo-driver-vnfm-svnfm-arm64' - project: 'vfc/nfvo/driver/vnfm/svnfm' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index f0569b764..abcf1ed2d 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -60,46 +60,6 @@ build-node: ubuntu1604-docker-8c-8g - project: - name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker-arm64 - project: 'vfc/nfvo/driver/vnfm/svnfm' - project-name: 'vfc-nfvo-driver-svnfm-nokiav2-arm64' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - subproject: - - 'docker-vnfm-nokiav2': - pom: 'nokiav2/pom.xml' - pattern: 'nokiav2/**' - jobs: - - '{project-name}-{subproject}-{stream}-verify-docker-cascade-trigger': - docker_build_args: '--file Dockerfile.verify --build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots' - docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment' - parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-verify-java' - - '{project-name}-{subproject}-{stream}-merge-docker-cascade-trigger': - docker_build_args: '--build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots' - docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment' - parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-merge-java' - - '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger': - docker_build_args: '--build-arg MODE= --build-arg REPO=staging' - docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment' - docker_registry: '$DOCKER_REGISTRY:10003' - parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-release-version-java-daily' -#Since the release is moved manually from the staging repo to the release repo this job can not -#be triggered in a cascade way - - '{project-name}-{subproject}-{stream}-release-version-docker-no-sonar': - docker_build_args: '--build-arg MODE= --build-arg REPO=releases' - docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment' - docker_registry: '$DOCKER_REGISTRY:10003' - files: 'nokiav2/**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar project: 'vfc/nfvo/driver/vnfm/svnfm' project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2' diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml index be7eb6db7..7aeb1b5a3 100644 --- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-nfvo-lcm-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-lcm-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-lcm-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index dd492f6c6..f209bbfc6 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -22,24 +22,6 @@ build-node: centos7-redis-4c-4g - project: - name: vfc-nfvo-lcm-java-arm64 - project-name: 'vfc-nfvo-lcm-arm64' - project: 'vfc/nfvo/lcm' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-lcm-settings' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-lcm-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-nfvo-lcm-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml index 86971218a..9611a96fa 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-nfvo-multivimproxy-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-multivimproxy-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-multivimproxy-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml index 827ff77a6..b848b1f4e 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml @@ -20,22 +20,6 @@ build-node: ubuntu1604-docker-8c-8g - project: - name: vfc-nfvo-multivimproxy-arm64 - project: 'vfc/nfvo/multivimproxy' - project-name: 'vfc-nfvo-multivimproxy-arm64' - mvn-settings: 'vfc-nfvo-multivimproxy-settings' - stream: - - 'master': - branch: 'master' - build-node: ubuntu1604-docker-arm64-4c-2g - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh' - -- project: name: vfc-nfvo-multivimproxy-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml index b9554267d..304ac8e48 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml @@ -12,15 +12,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-nfvo-resmanagement-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-resmanagement-arm64' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-resmanagement-arm64-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 78788d38a..4d54d0eb5 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -20,22 +20,6 @@ build-node: ubuntu1604-docker-8c-8g - project: - name: vfc-nfvo-resmanagement-arm64 - project: 'vfc/nfvo/resmanagement' - project-name: 'vfc-nfvo-resmanagement-arm64' - mvn-settings: 'vfc-nfvo-resmanagement-settings' - stream: - - 'master': - branch: 'master' - build-node: ubuntu1604-docker-arm64-4c-2g - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh' - -- project: name: vfc-nfvo-resmanagement-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml index 4b3e95d00..591ad8236 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml @@ -14,17 +14,3 @@ robot-options: '' branch: 'master' -- project: - name: vfc-nfvo-wfengine-csit-arm64 - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-wfengine-arm64' - stream: 'master' - functionality: - - 'sanity-check' - trigger_jobs: - - 'vfc-nfvo-wfengine-arm64-master-engine-activiti-extension-docker-java-version-shell-daily' - - 'vfc-nfvo-wfengine-arm64-master-engine-mgr-service-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index d726f331a..0e9bcf864 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -29,32 +29,6 @@ build-node: ubuntu1604-builder-4c-4g - project: - name: vfc-nfvo-wfengine-arm64 - project-name: 'vfc-nfvo-wfengine-arm64' - project: 'vfc/nfvo/wfengine' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - subproject: - - 'engine-mgr-service': - pom: 'wfenginemgrservice/pom.xml' - pattern: 'wfenginemgrservice/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' - - 'engine-activiti-extension': - pom: 'activiti-extension/pom.xml' - pattern: 'activiti-extension/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' - jobs: - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - mvn-goals: 'clean' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - -- project: name: vfc-nfvo-wfengine-wfenginemgrservice-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index b5d2891e6..04d653676 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -14,3 +14,17 @@ - 'healthCheck': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' robot-options: '' + +- project: + name: vid-csit-arm64 + jobs: + - '{project-name}-arm64-{stream}-verify-csit-{functionality}' + - '{project-name}-arm64-{stream}-csit-{functionality}' + project-name: 'vid' + stream: + - 'master': + branch: 'master' + functionality: + - 'healthCheck': + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' + robot-options: '' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 06309e344..54a680e1e 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -43,6 +43,22 @@ build-node: queue-docker-4c-4g - project: + name: vid-docker-arm64 + project-name: 'vid-arm64' + jobs: + - 'docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + project: 'vid' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vid-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + +- project: name: vid-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 04a0554cd..9f6a4068d 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -33,6 +33,25 @@ mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g - project: + name: vnfsdk-dovetail-integration-arm64 + project-name: 'vnfsdk-dovetail-integration-arm64' + project: 'vnfsdk/dovetail-integration' + pom: 'pom.xml' + python-version: python2.7 + tox-dir: '.' + tox-envs: '' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vnfsdk-dovetail-integration-settings' + build-node: ubuntu1604-docker-arm64-4c-2g + jobs: + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + +- project: name: vnfsdk-dovetail-integration-tox-sonar jobs: - gerrit-tox-sonar diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index f63d279a1..a845ee113 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -50,6 +50,29 @@ docker-pom: 'docker/pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' + build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: vnfsdk-ice-docker-arm64 + project-name: 'vnfsdk-ice-docker-arm64' + project: 'vnfsdk/ice' + pom: 'pom.xml' + stream: + - 'master': + branch: 'master' + subproject: + - 'docker': + path: 'docker' + pattern: 'docker/**' + pom: 'docker/pom.xml' + mvn-settings: 'vnfsdk-ice-settings' + build-node: ubuntu1604-docker-arm64-4c-2g + jobs: + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'docker/pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' - project: name: vnfsdk-ice-validation-scripts-tox-sonar diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 591242236..c1d2c6c3d 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -15,6 +15,7 @@ docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' + build-node: ubuntu1604-docker-8c-8g project: 'vnfsdk/refrepo' stream: - 'master': @@ -25,6 +26,27 @@ build-node: ubuntu1604-builder-4c-4g - project: + name: vnfsdk-refrepo-arm64 + project-name: 'vnfsdk-refrepo-arm64' + jobs: + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' + mvn-goals: 'docker:build' + docker-image-name: 'onap/vnfsdk/refrepo' + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + project: 'vnfsdk/refrepo' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vnfsdk-refrepo-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-arm64-4c-2g + +- project: name: vnfsdk-refrepo-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index 1918ff38a..94861bd75 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -12,16 +12,20 @@ path: '.' pattern: '**' mvn-settings: 'vvp-validation-scripts-settings' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1604-docker-8c-8g jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-docker-java-daily': + mvn-params: '-Dmaven.test.skip=true' + docker-pom: 'pom.xml' + mvn-profile: 'default' - project: name: vvp-validation-scripts-sonar jobs: - gerrit-maven-sonar cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1604-docker-8c-8g project: 'vvp/validation-scripts' project-name: 'vvp-validation-scripts' branch: 'master' |