diff options
137 files changed, 1197 insertions, 1288 deletions
diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index 42ed60897..9afb39d76 100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -51,7 +51,7 @@ jenkins-jobs test --recursive jjb/ Backup the jenkins.ini.example to jenkins.ini -`cp jenkins.ini.example jenkins.ini` +`cp jenkins.ini.example ~/.config/jenkins_jobs/jenkins_jobs.ini` After copying the jenkins.ini.example, modify `jenkins.ini` with your **Jenkins LFID username**, **API token** and **ONAP jenkins sandbox URL** @@ -83,9 +83,9 @@ update or delete jobs in your sandbox environment. After you modify or create jobs in the above environment, it's good practice to test the job in sandbox environment before you submit this job to production CI environment. -`jenkins-jobs --conf jenkins.ini test jjb/ <job-name>` +`jenkins-jobs test jjb/ <job-name>` -**Example:** `jenkins-jobs --conf jenkins.ini test jjb/ sdc-master-verify-java` +**Example:** `jenkins-jobs test jjb/ sdc-master-verify-java` If the job you’d like to test is a template with variables in its name, it must be manually expanded before use. For example, the commonly used template `sdc-{stream}-verify-java` @@ -96,7 +96,7 @@ specified JJB job name. Execute the following command to pipe-out to a directory: -`jenkins-jobs --conf jenkins.ini test jjb/ <job-name> -o <directoryname>` +`jenkins-jobs test jjb/ <job-name> -o <directoryname>` The output directory will contain files with the XML configurations. @@ -107,9 +107,9 @@ outputting valid XML descriptions of Jenkins jobs. Upon successful verification, execute the following command to update the job to the Jenkins sandbox. -`jenkins-jobs --conf jenkins.ini update jjb/ <job-name>` +`jenkins-jobs update jjb/ <job-name>` -**Example:** `jenkins-jobs --conf jenkins.ini update jjb/ sdc-master-verify-java` +**Example:** `jenkins-jobs update jjb/ sdc-master-verify-java` ## Trigger jobs from Jenkins Sandbox: @@ -132,9 +132,9 @@ details and the console output. Execute the following command to Delete a job from Sandbox: -`jenkins-jobs --conf jenkins.ini delete jjb/ <job-name>` +`jenkins-jobs delete jjb/ <job-name>` -**Example:** `jenkins-jobs --conf jenkins.ini delete jjb/ sdc-master-verify-java` +**Example:** `jenkins-jobs delete jjb/ sdc-master-verify-java` The above command would delete the `sdc-master-verify-java` job. diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg index 60167f281..db219ca50 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20190123-052615.439 LABELS=ubuntu1604-docker-8c-8g HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg new file mode 100644 index 000000000..5b7d179f6 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904 +LABELS=ubuntu1604-docker-8c-8g +HARDWARE_ID=v1-standard-4 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..c77e402b2 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -33,9 +33,9 @@ - gerrit-maven-sonar cron: '@daily' build-node: ubuntu1604-builder-4c-4g - project: 'aai/resources' + project: 'aai/schema-service' 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' @@ -46,7 +46,7 @@ jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: 'aai/resources' + project: 'aai/schema-service' project-name: 'aai-schema-service' stream: - 'master': 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' diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml index 4253db44b..00923cc1f 100644 --- a/jjb/appc/appc-cdt.yaml +++ b/jjb/appc/appc-cdt.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'appc-cdt-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml index 3fe00498d..7e8dfa37a 100644 --- a/jjb/appc/appc-csit.yaml +++ b/jjb/appc/appc-csit.yaml @@ -7,9 +7,7 @@ project-name: 'appc' stream: - 'master': - branch: master - - 'casablanca': - branch: 'casablanca' + branch: 'master' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index a46313add..aa15deb0e 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -13,8 +13,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' @@ -22,23 +20,23 @@ mvn-profile: docker build-node: ubuntu1604-builder-4c-4g -- project: - name: appc-deployment-arm64 - project-name: 'appc-deployment-arm64' - jobs: - - '{project-name}-docker-image-blessing' - - project: 'appc/deployment' - stream: - - 'master': - branch: 'master' - mvn-settings: 'appc-deployment-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: appc-deployment-arm64 +# project-name: 'appc-deployment-arm64' +# jobs: +# - '{project-name}-docker-image-blessing' +# +# project: 'appc/deployment' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'appc-deployment-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: appc-deployment-docker project-name: 'appc-deployment' @@ -51,30 +49,28 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: queue-docker-4c-4g + build-node: ubuntu1604-docker-8c-8g -- project: - name: appc-deployment-arm64-docker - project-name: 'appc-deployment-arm64' - jobs: - - 'docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - - 'docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - project: 'appc/deployment' - stream: - - 'master': - branch: 'master' - mvn-settings: 'appc-deployment-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g +#- project: +# name: appc-deployment-arm64-docker +# project-name: 'appc-deployment-arm64' +# jobs: +# - 'docker-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# - 'docker-version-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# project: 'appc/deployment' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'appc-deployment-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 912050488..80b6df28c 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -14,8 +14,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'appc-settings' files: '**' archive-artifacts: '' @@ -39,7 +37,7 @@ jobs: - gerrit-maven-clm: mvn-params: '-DskipTests' - build-timeout: 30 + build-timeout: 60 build-node: ubuntu1604-builder-8c-8g nexus-iq-namespace: 'onap-' project: 'appc' diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index 99025ac08..e9dcc4bf7 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -17,7 +17,5 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'appc-parent-settings' build-node: ubuntu1604-builder-2c-1g diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index f85ad5f62..a5a48693e 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -3,7 +3,9 @@ name: ccsdk-project-view project-name: ccsdk views: - - project-view + - common-view + view-name: ccsdk + view-regex: '(?!.*-maven-stage-)(ccsdk-.*)$' - project: name: ccsdk-apps @@ -11,6 +13,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/apps' @@ -75,20 +78,20 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: queue-docker-4c-4g - -- project: - name: ccsdk-apps-arm64-docker - project-name: 'ccsdk-apps-arm64' - jobs: - - 'docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - project: 'ccsdk/apps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-apps-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g +# +#- project: +# name: ccsdk-apps-arm64-docker +# project-name: 'ccsdk-apps-arm64' +# jobs: +# - 'docker-version-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# project: 'ccsdk/apps' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'ccsdk-apps-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index f1efc6193..d5632167d 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/cds' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 174f41f80..77d2da149 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/distribution' stream: @@ -38,23 +39,23 @@ mvn-profile: docker build-node: queue-docker-4c-4g -- project: - name: ccsdk-distribution-arm64-docker - project-name: 'ccsdk-distribution-arm64' - jobs: - - 'docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - project: 'ccsdk/distribution' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-distribution-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: ccsdk-distribution-arm64-docker +# project-name: 'ccsdk-distribution-arm64' +# jobs: +# - 'docker-version-java-daily': +# mvn-params: '-Dmaven.test.skip=true' +# project: 'ccsdk/distribution' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'ccsdk-distribution-settings' +# files: '**' +# archive-artifacts: '' +# docker-pom: 'pom.xml' +# mvn-profile: docker +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: ccsdk-distribution-clm jobs: diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 5a9c8ce5e..aa31724bd 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/features' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 0cebc4d1e..369960c25 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/parent' diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 8610819b0..74d16b38b 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/platform/plugins' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index b880dcc0f..d88fbe8cd 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/sli/adaptors' diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index fee7df8ad..389a765c4 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/sli/core' diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 5c85642f6..bfc983423 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/sli/northbound' diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 27f06c9fc..c4ef4a1c7 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/sli/plugins' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index b0b011f07..713eafde8 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/utils' diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml new file mode 100644 index 000000000..8915a2caa --- /dev/null +++ b/jjb/ci-management/ci-management-views.yaml @@ -0,0 +1,121 @@ +--- +- releng_view: &releng_view_common + name: releng-view-common + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - jacoco + - find-bugs + - robot-list + recurse: false + +- project: + name: '00-Empty View' + views: + - common-view + view-name: '00-Empty View' + view-description: > + Empty job view. This is used as the default landing view to keep the + Jenkins UI responding better while a) under high load and b) when there + are a lot of jobs defined in the system + view-regex: '' + +- view: + name: 01-Recent + regex: '.*' + description: 'List of most recent jobs' + job-filters: + most-recent: + max-to-include: 25 + check-start-time: true + <<: *releng_view_common + +- project: + name: All-Sonar + views: + - common-view + view-name: All-Sonar + view-regex: '^(?=.*-sonar)(?!.*-no-sonar).*' + view-description: 'List of Sonar jobs' + +- view: + name: CLM + description: 'List of CLM jobs' + regex: '.*-clm-.*' + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - policy-violations + recurse: false + +- project: + name: CSIT + views: + - csit-view + view-name: CSIT + view-description: 'List of CSIT jobs' + view-regex: '^.*-csit-.*' + +- project: + name: CSIT-Verify + views: + - csit-view + view-name: CSIT-Verify + view-description: 'List of CSIT Verify jobs' + view-regex: '^.*-verify-csit.*' + +- view: + name: Daily-Jobs + views: + - common-view + view-name: Daily-Jobs + view-description: 'List of Daily Jobs' + view-regex: '.*-daily' + +- view: + name: External-Labs + views: + - common-view + view-name: External-Labs + view-description: 'List of External Labs jobs' + view-regex: '^lab-.*' + +- project: + name: Merge-Jobs + views: + - common-view + view-name: Merge-Jobs + view-description: 'List of Merge jobs' + view-regex: '.*-merge-.*' + +- project: + name: Thirdparty + views: + - common-view + view-name: Thirdparty + view-description: 'List of Nexus Thirdparty dependencies jobs' + view-regex: '.*-thirdparty-.*' + +- project: + name: Verify-Jobs + views: + - common-view + view-name: Verify-Jobs + view-description: 'List of Verify jobs' + view-regex: '^.*-verify-.*' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index b2cefd290..56c74d8a4 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -27,24 +27,24 @@ archive-artifacts: '' 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-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: diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml index acd46863b..acd46863b 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index bd28fb3cf..1433f7762 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' # apply to all jobs project: 'dcaegen2/collectors/datafile' mvn-settings: 'dcaegen2-collectors-datafile-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml index 128a50e3f..749d01e41 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves-csit.yaml @@ -7,8 +7,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' functionality: - 'testsuites': trigger_jobs: diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 81f5b599e..c87c42f81 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' # apply to all jobs project: 'dcaegen2/collectors/hv-ves' mvn-settings: 'dcaegen2-collectors-hv-ves-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index c002f3eb0..f94390fe6 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-collectors-snmptrap-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index e84fb5988..b7a234ef4 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-collectors-ves-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml index 6962c6287..db0b4f680 100644 --- a/jjb/dcaegen2/dcaegen2-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-csit.yaml @@ -7,8 +7,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' functionality: - 'testsuites' trigger_jobs: @@ -24,8 +22,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' functionality: - 'prh-testsuites' trigger_jobs: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index dad7e8b67..ed84baeaa 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-deployments-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties @@ -21,7 +19,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1604-docker-v1-8c-8g' build-timeout: 180 - project: diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 9eefd6667..7420ff0ad 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-platform-blueprints-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml deleted file mode 100644 index 64849c331..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: dcaegen2-platform-cdapbroker - project-name: 'dcaegen2-platform-cdapbroker' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'dcaegen2/platform/cdapbroker' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-platform-cdapbroker-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-docker-8c-8g' - -- project: - name: dcaegen2-platform-cdapbroker-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/cdapbroker - build-node: ubuntu1604-docker-8c-8g - project-name: 'dcaegen2-platform-cdapbroker' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cdapbroker-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 2e4199e08..c18c96c6b 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-platform-configbinding-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 4bdcb9cc2..1da8ec11a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-platform-deployment-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index e2041db7b..66a74fa14 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-platform-inventory-api-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 9153531ec..9c50feb7a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-platform-plugins-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 258bb4744..99fa67f3a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-platform-policy-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index e46df4e5e..872c4dfd5 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/vnfsdk/vnfsdk-ice-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml index 3fc35c9fc..38216d1e8 100644 --- a/jjb/vnfsdk/vnfsdk-ice-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml @@ -1,13 +1,13 @@ ---- - project: - name: vnfsdk-ice-csit + name: dcae-bulkpm-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vnfsdk-ice' + project-name: 'dcaegen2-pmmapper' stream: 'master' functionality: - - 'sanity-check': + - 'pmmapper': trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 344ee5363..50a190121 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-services-prh-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml new file mode 100644 index 000000000..265bebf53 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -0,0 +1,43 @@ +--- +- project: + name: dcaegen2-services-son-handler + project-name: 'dcaegen2-services-son-handler' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/services/son-handler' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-services-son-handler-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-son-handler-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/services/son-handler' + project-name: 'dcaegen2-services-son-handler' + branch: 'master' + mvn-settings: 'dcaegen2-services-son-handler-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-son-handler-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/services/son-handler + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-son-handler' + branch: 'master' + mvn-settings: 'dcaegen2-services-son-handler-settings' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index f817e4f6f..4f00adc8f 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -13,8 +13,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'dcaegen2-utils-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 17d372e23..c0366b2e4 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -17,8 +17,6 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' mvn-settings: 'dcaegen2-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml index 3a54b4263..e1cabcfb1 100644 --- a/jjb/dmaap/dmaap-datarouter-csit.yaml +++ b/jjb/dmaap/dmaap-datarouter-csit.yaml @@ -14,6 +14,18 @@ - 'dr-suite': trigger_jobs: - '{project-name}-{stream}-docker-java-shell-daily' + robot-options: '' + +- project: + name: dmaap-datarouter-csit-ssl + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dmaap-datarouter' + stream: + - 'master': + branch: 'master' + functionality: - 'ssl-dr-suite': trigger_jobs: - '{project-name}-{stream}-docker-java-shell-daily' 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 c5b69ba8e..bf27f50b1 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 @@ -24,25 +24,25 @@ build-node: ubuntu1604-builder-4c-4g 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-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: 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 ad3af90d1..15b1a4273 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 @@ -23,26 +23,26 @@ build-node: ubuntu1604-builder-4c-4g 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-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: 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 685b4c6ca..71fbb33bd 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 @@ -23,24 +23,24 @@ build-node: ubuntu1604-builder-4c-4g 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-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: 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 3525bb073..3feabec6e 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 @@ -22,23 +22,23 @@ archive-artifacts: '' 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-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: diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index dcbd07a54..0e5919f0f 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -28,25 +28,25 @@ archive-artifacts: '' 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-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: diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index a86a1784e..4c5e188e7 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -27,25 +27,25 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: msb-apigateway-arm64 - project-name: 'msb-apigateway-arm64' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-apigateway-docker-image.sh' - - project: 'msb/apigateway' - stream: - - 'master': - branch: 'master' - mvn-settings: 'msb-apigateway-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g - +#- project: +# name: msb-apigateway-arm64 +# project-name: 'msb-apigateway-arm64' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-apigateway-docker-image.sh' +# +# project: 'msb/apigateway' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'msb-apigateway-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g +# - project: name: msb-apigateway-sonar jobs: diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 53976484c..ed89cab54 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -21,24 +21,24 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: msb-discovery-arm64 - project-name: 'msb-discovery-arm64' - jobs: - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-discovery-docker-image.sh' - build-node: ubuntu1604-docker-arm64-4c-2g - project: 'msb/discovery' - stream: - - 'master': - branch: 'master' - mvn-settings: 'msb-discovery-settings' - files: '**' - archive-artifacts: '' - +#- project: +# name: msb-discovery-arm64 +# project-name: 'msb-discovery-arm64' +# jobs: +# - '{project-name}-{stream}-docker-java-version-shell-daily': +# docker-pom: 'pom.xml' +# mvn-goals: 'install' +# script: +# !include-raw-escape: 'build-discovery-docker-image.sh' +# build-node: ubuntu1604-docker-arm64-4c-2g +# project: 'msb/discovery' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'msb-discovery-settings' +# files: '**' +# archive-artifacts: '' +# - project: name: msb-discovery-sonar jobs: diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 26842cb18..e4f69ffd6 100755 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -5,13 +5,11 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -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 diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index 520a97aec..ac4fd2212 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -27,28 +27,28 @@ archive-artifacts: '' 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-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 jobs: diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index d59d92ed0..52ab6416b 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -27,28 +27,28 @@ archive-artifacts: '' 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-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: diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 4131c7f14..c15eeed7f 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -24,24 +24,24 @@ 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 +#- 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-casablanca.yaml b/jjb/multicloud/multicloud-openstack-casablanca.yaml deleted file mode 100644 index bbe90c551..000000000 --- a/jjb/multicloud/multicloud-openstack-casablanca.yaml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- project: - name: multicloud-openstack-casablanca - project-name: 'multicloud-openstack-casablanca' - project: 'multicloud/openstack' - stream: - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'multicloud-openstack-settings' - subproject: - - 'newton': - path: 'newton' - pattern: 'newton/**' - pom: 'newton/pom.xml' - - 'newton_share': - path: 'newton' - pattern: 'share/**' - pom: 'newton/pom.xml' - - 'ocata': - path: 'ocata' - pattern: 'ocata/**' - pom: 'ocata/pom.xml' - - 'ocata_share': - path: 'ocata' - pattern: 'share/**' - pom: 'ocata/pom.xml' - - 'pike': - path: 'pike' - pattern: 'pike/**' - pom: 'pike/pom.xml' - - 'pike_share': - path: 'pike' - pattern: 'share/**' - pom: 'pike/pom.xml' - - 'windriver': - path: 'windriver' - pattern: 'windriver/**' - pom: 'windriver/pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - - '{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-8c-8g - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-memcached-4c-4g' - - diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml index 374b27fa0..d44ac3c51 100644 --- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml @@ -10,10 +10,10 @@ - 'functionality1': trigger_jobs: - 'multicloud-openstack-master-docker-java-version-shell-daily' - - 'multicloud-openstack-arm64-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' - - 'multicloud-openstack-arm64-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 c8a6cd88b..2e3685680 100644 --- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml @@ -10,6 +10,6 @@ - 'functionality1': trigger_jobs: - 'multicloud-openstack-master-docker-java-version-shell-daily' - - 'multicloud-openstack-arm64-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-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml index 4c56a372d..4becc196c 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml @@ -10,6 +10,6 @@ - 'functionality1': trigger_jobs: - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' - - 'multicloud-openstack-vmware-arm64-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 3c8be8acf..7660d58c6 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -27,28 +27,28 @@ archive-artifacts: '' 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-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: diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml index 6718c4dc3..972535e22 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml @@ -25,24 +25,24 @@ 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: '' +#- 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 1dbac8366..6ec4a7dac 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -14,14 +14,6 @@ branch: 'master' mvn-settings: 'multicloud-openstack-settings' subproject: - - 'newton': - path: 'newton' - pattern: 'newton/**' - pom: 'newton/pom.xml' - - 'newton_share': - path: 'newton' - pattern: 'share/**' - pom: 'newton/pom.xml' - 'ocata': path: 'ocata' pattern: 'ocata/**' @@ -50,6 +42,14 @@ path: 'windriver' pattern: 'windriver/**' pom: 'windriver/pom.xml' + - 'windriver_share': + path: 'windriver' + pattern: 'share/**' + pom: 'windriver/pom.xml' + - 'fcaps': + path: 'fcaps' + pattern: 'fcaps/**' + pom: 'fcaps/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' @@ -65,38 +65,24 @@ archive-artifacts: '' 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 - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'multicloud/openstack' - project-name: 'multicloud-openstack-newton' - branch: 'master' - mvn-params: '-f newton/pom.xml' - mvn-settings: 'multicloud-openstack-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - +#- 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-ocata-sonar jobs: @@ -163,3 +149,17 @@ build-node: ubuntu1604-memcached-4c-4g branch: 'master' mvn-settings: 'multicloud-openstack-settings' + +- project: + name: multicloud-openstack-fcaps-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack-fcaps' + branch: 'master' + mvn-params: '-f fcaps/pom.xml' + mvn-settings: 'multicloud-openstack-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 762b078d4..f066dd824 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -30,8 +30,8 @@ stream: - 'master': branch: 'master' - - 'beijing': - branch: 'beijing' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': diff --git a/jjb/policy/drools-apps-docker-merge.sh b/jjb/policy/drools-apps-docker-merge.sh new file mode 100644 index 000000000..9291c0b39 --- /dev/null +++ b/jjb/policy/drools-apps-docker-merge.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO MERGE DROOLS APPLICATIONS DOCKER IMAGE =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 controlloop/build/docker-cl + +controlloop/build/docker-cl --merge diff --git a/jjb/policy/drools-apps-docker-release.sh b/jjb/policy/drools-apps-docker-release.sh new file mode 100644 index 000000000..07755b72c --- /dev/null +++ b/jjb/policy/drools-apps-docker-release.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO RELEASE DROOLS APPLICATIONS DOCKER IMAGE =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 controlloop/build/docker-cl + +controlloop/build/docker-cl --release diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index aa5d49bc8..1fba9abf7 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: false + disabled: true build-node: ubuntu1604-docker-8c-8g project: 'policy/apex-pdp' stream: diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 9c2874b86..ccf18d31c 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -4,7 +4,16 @@ project-name: 'policy-api' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + disabled: true + build-node: ubuntu1604-docker-8c-8g project: 'policy/api' stream: diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index d81fb7e96..d4e80b993 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: false + disabled: true project: 'policy/common' stream: diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 90ee700cb..33ad95d98 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -53,3 +53,51 @@ - 'policy-distribution-{stream}-merge-java' robot-options: '' branch: 'master' + +- project: + name: policy-api-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'api' + trigger_jobs: + - 'policy-api-{stream}-merge-java' + robot-options: '' + branch: 'master' + +- project: + name: policy-xacml-pdp-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'xacml-pdp' + trigger_jobs: + - 'policy-xacml-pdp-{stream}-merge-java' + robot-options: '' + branch: 'master' + +- project: + name: policy-pap-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'pap' + trigger_jobs: + - 'policy-pap-{stream}-merge-java' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 6c529c89a..c2ad0f723 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: false + disabled: true 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 7661e5079..49da3d215 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -4,9 +4,19 @@ project-name: 'policy-drools-applications' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily': + - '{project-name}-{stream}-merge-scm-mvn-script': + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'drools-apps-docker-merge.sh' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + script: + !include-raw-escape: 'drools-apps-docker-release.sh' disabled: true + build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-applications' stream: @@ -24,7 +34,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: false + disabled: true project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 5e34e7791..367783742 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: false + disabled: true 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 a52553818..70d9c3a9f 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: false + disabled: true build-node: ubuntu1604-docker-8c-8g project: 'policy/engine' stream: diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 0b8e733ea..f5b235364 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -4,7 +4,16 @@ project-name: 'policy-pap' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + disabled: true + build-node: ubuntu1604-docker-8c-8g project: 'policy/pap' stream: diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 83e590cc5..5726eb0f6 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -4,7 +4,16 @@ project-name: 'policy-xacml-pdp' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + disabled: true + build-node: ubuntu1604-docker-8c-8g project: 'policy/xacml-pdp' stream: diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index 45a4541f5..cba0aba91 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -16,8 +16,8 @@ stream: - 'master': branch: 'master' - - 'release-2.4.0': - branch: 'release-2.4.0' + - 'release-2.5.0': + branch: 'release-2.5.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 42c93cf9c..1af647470 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' functionality: - 'sanity': trigger_jobs: '{project-name}-{stream}-sdc-merge-java' @@ -22,23 +20,23 @@ 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' +#- 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 5c4385bc6..b012061ad 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -21,31 +21,29 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'sdc-dcae-d-ci-settings' - files: '**' - archive-artifacts: '' - 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-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: @@ -54,7 +52,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/ci' project-name: 'sdc-dcae-d-ci' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-ci-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -67,5 +65,5 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/ci project-name: 'sdc-dcae-d-ci' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-ci-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 3630b4dde..f5c613eff 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -15,32 +15,30 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' files: '**' archive-artifacts: '' 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-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: @@ -49,7 +47,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt-be-main' project-name: 'sdc-dcae-d-dt-be-main' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -62,5 +60,5 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/dt-be-main project-name: 'sdc-dcae-d-dt-be-main' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index 3949f62f0..5e66fdbc1 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -10,8 +10,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' files: '**' archive-artifacts: '' @@ -25,7 +23,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt-be-property' project-name: 'sdc-dcae-d-dt-be-property' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -38,5 +36,5 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/dt-be-property project-name: 'sdc-dcae-d-dt-be-property' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 6338c8c04..16c0a0a4a 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -16,32 +16,30 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'sdc-dcae-d-dt-settings' - files: '**' - archive-artifacts: '' - 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-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: @@ -50,7 +48,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/dt' project-name: 'sdc-dcae-d-dt' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-dt-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -64,5 +62,5 @@ project: sdc/dcae-d/dt project-name: 'sdc-dcae-d-dt' build-node: ubuntu1604-builder-4c-2g - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-dt-settings' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 9cc5de72c..4a273c696 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -16,31 +16,29 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'sdc-dcae-d-fe-settings' - files: '**' - archive-artifacts: '' - 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-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: @@ -49,7 +47,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/dcae-d/fe' project-name: 'sdc-dcae-d-fe' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-fe-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -63,5 +61,5 @@ project: sdc/dcae-d/fe project-name: 'sdc-dcae-d-fe' build-node: ubuntu1604-builder-4c-2g - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-fe-settings' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 6b4a3b69a..0b11da733 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' subproject: - dcae-d-tosca-lab: path: '.' @@ -21,25 +19,25 @@ docker-pom: 'pom.xml' 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-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: @@ -48,7 +46,7 @@ build-node: ubuntu1604-docker-8c-8g project: 'sdc/dcae-d/tosca-lab' project-name: 'sdc-dcae-d-tosca-lab' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-dcae-d-tosca-lab-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index e6765a4ba..5886991ad 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' @@ -32,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/jtosca' project-name: 'sdc-jtosca' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-jtosca-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -45,5 +43,5 @@ nexus-iq-namespace: 'onap-' project: sdc/jtosca project-name: 'sdc-jtosca' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-jtosca-settings' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 3560a5f85..540da4199 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -5,33 +5,33 @@ project-name: 'sdc-sdc-docker-base' jobs: - '{project-name}-{stream}-sdc-merge-java': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'default' project: 'sdc/sdc-docker-base' stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' 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' +#- project: +# name: sdc-sdc-docker-base-arm64 +# project-name: 'sdc-sdc-docker-base-arm64' +# jobs: +# - '{project-name}-{stream}-sdc-merge-java': +# build-node: 'ubuntu1604-docker-8c-8g' +# 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-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 140953192..f94773a87 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -17,8 +17,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-sdc-pubsub-settings' files: '**' archive-artifacts: '' @@ -33,7 +31,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-pubsub' project-name: 'sdc-sdc-pubsub' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-sdc-pubsub-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 90692c748..ab25246db 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' @@ -32,7 +30,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-tosca' project-name: 'sdc-sdc-tosca' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-sdc-tosca-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -45,5 +43,5 @@ nexus-iq-namespace: 'onap-' project: sdc/sdc-tosca project-name: 'sdc-sdc-tosca' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-sdc-tosca-settings' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 30497155e..21ece3462 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -19,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' @@ -29,24 +27,24 @@ build-node: ubuntu1604-builder-4c-4g 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-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: @@ -55,7 +53,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-workflow-designer' project-name: 'sdc-sdc-workflow-designer' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-sdc-workflow-designer-settings' mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -69,5 +67,5 @@ project: sdc/sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' build-node: ubuntu1604-builder-4c-4g - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-sdc-workflow-designer-settings' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index cfdaad2f5..d0a110e79 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -30,6 +30,7 @@ - '{project-name}-{stream}-verify-java': mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' - '{project-name}-{stream}-sdc-merge-java': + build-node: 'ubuntu1604-docker-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' @@ -44,32 +45,30 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-8c-8g maven-version: 'mvn35' -- project: - name: sdc-arm64 - project-name: 'sdc-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 -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-arm64 +# project-name: 'sdc-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 -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: @@ -78,7 +77,7 @@ build-node: ubuntu1604-builder-8c-8g project: 'sdc' project-name: 'sdc' - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-settings' mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' mvn-goals: 'clean install' @@ -95,5 +94,5 @@ project: sdc project-name: 'sdc' build-node: ubuntu1604-docker-8c-8g - branch: 'casablanca' + branch: 'master' mvn-settings: 'sdc-settings' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 803570a4b..3b82a9bea 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -62,23 +62,23 @@ files: '**' archive-artifacts: '' build-node: queue-docker-4c-4g - -- project: - name: sdnc-apps-docker-arm64 - project-name: 'sdnc-apps-arm64' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: 'sdnc/apps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-apps-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g +# +#- project: +# name: sdnc-apps-docker-arm64 +# project-name: 'sdnc-apps-arm64' +# jobs: +# - 'docker-version-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: 'sdnc/apps' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdnc-apps-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g - project: name: sdnc-apps-clm diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index c69ae9eda..4be63a24f 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -37,23 +37,23 @@ files: '**' archive-artifacts: '' build-node: queue-docker-4c-4g - -- project: - name: sdnc-oam-docker-arm64 - project-name: 'sdnc-oam-arm64' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: 'sdnc/oam' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-oam-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-arm64-4c-2g +# +#- project: +# name: sdnc-oam-docker-arm64 +# project-name: 'sdnc-oam-arm64' +# jobs: +# - 'docker-version-java-daily': +# docker-pom: 'pom.xml' +# mvn-profile: 'docker' +# mvn-params: '-Dmaven.test.skip=true' +# project: 'sdnc/oam' +# stream: +# - 'master': +# branch: 'master' +# mvn-settings: 'sdnc-oam-settings' +# files: '**' +# archive-artifacts: '' +# build-node: ubuntu1604-docker-arm64-4c-2g - project: name: sdnc-oam-clm diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/usecaseui/usecase-ui-server-csit.yaml deleted file mode 100644 index b348d065f..000000000 --- a/jjb/usecaseui/usecase-ui-server-csit.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- project: - name: usecase-ui-server-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'usecase-ui-server' - stream: 'master' - functionality: - - 'testsuite': - trigger_jobs: '{project-name}-{stream}-docker-java-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml deleted file mode 100644 index d15748925..000000000 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vfc-gvnfm-vnfmgr-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-gvnfm-vnfmgr' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' - diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index 04d653676..c4643e565 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -15,16 +15,16 @@ 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: '' +#- 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 54a680e1e..b10a71795 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -42,22 +42,22 @@ archive-artifacts: '' 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-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: diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml new file mode 100644 index 000000000..33a21d682 --- /dev/null +++ b/jjb/vnfrqts/build-and-upload.yaml @@ -0,0 +1,70 @@ +--- +- job-template: + # Job template for running a script to build an artifact and + # upload it to nexus as RAW artifacts. + # + + name: '{project-name}-{stream}-build-and-upload' + + pre_script: '' + post_script: '' + artifact_name: '' + project_id: '' + + project-type: freestyle + concurrent: true + node: '{build-node}' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + + scm: + - git: + credentials-id: '{jenkins-ssh-credential}' + url: '$GIT_BASE' + refspec: '' + choosing-strategy: 'default' + branches: + - 'refs/heads/{branch}' + skip-tag: true + wipe-workspace: true + submodule: + recursive: '{submodule-recursive}' + timeout: '24' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - timed: 'H H * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - lf-provide-maven-settings: + global-settings-file: '{mvn-global-settings}' + settings-file: '{mvn-settings}' + - shell: '{obj:pre_script}' + - lf-infra-create-netrc: + server-id: ecomp-raw + - inject: + properties-content: | + ARTIFACT_NAME={artifact_name} + PROJECT_ID={project_id} + - shell: '{obj:post_script}' + - lf-provide-maven-settings-cleanup + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}'
\ No newline at end of file diff --git a/jjb/vnfrqts/post-upload-artifact.sh b/jjb/vnfrqts/post-upload-artifact.sh new file mode 100644 index 000000000..588e49b04 --- /dev/null +++ b/jjb/vnfrqts/post-upload-artifact.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e -o pipefail +set -- $ARTIFACT_NAME +if [ -z "$ARTIFACT_NAME" ] +then + echo "ERROR NO ARTIFACTS ENTERED" +else + if [ -z "$2" ] + then + cd $WORKSPACE/docs/data + echo "-n --upload-file $ARTIFACT_NAME https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME" + curl -n --upload-file "$ARTIFACT_NAME" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$ARTIFACT_NAME" + else + cd $WORKSPACE/ice_validator/output + echo "-n --upload-file $1 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1" + curl -n --upload-file "$1" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$1" + echo "-n --upload-file $2 https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2" + curl -n --upload-file "$2" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/$GERRIT_BRANCH/$2" + fi +fi
\ No newline at end of file diff --git a/jjb/vnfrqts/pre-build-needs.sh b/jjb/vnfrqts/pre-build-needs.sh new file mode 100644 index 000000000..da1d5e2d1 --- /dev/null +++ b/jjb/vnfrqts/pre-build-needs.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +virtualenv $WORKSPACE/venv-tox +source $WORKSPACE/venv-tox/bin/activate +pip install --upgrade pip +pip install -r etc/requirements.txt +ls +tox -e needs
\ No newline at end of file diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml index e62095f83..7bb260e4b 100644 --- a/jjb/vnfrqts/vnfrqts-requirements.yaml +++ b/jjb/vnfrqts/vnfrqts-requirements.yaml @@ -7,3 +7,19 @@ project-name: 'vnfrqts-requirements' branch: 'master' mvn-settings: 'vnfrqts-requirements-settings' + +- project: + name: vnfrqts-requirements-upload-json + project: 'vnfrqts/requirements' + project-name: 'vnfrqts-requirements' + mvn-settings: 'vnfrqts-requirements-settings' + mvn-global-settings: 'global-settings' + stream: + - 'master': + branch: 'master' + jobs: + - '{project-name}-{stream}-build-and-upload': + pre_script: !include-raw-escape: pre-build-needs.sh + artifact_name: needs.json + project_id: org.onap.vnfrqts.requirements + post_script: !include-raw-escape: post-upload-artifact.sh diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 9f6a4068d..499bfae52 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -32,25 +32,25 @@ mvn-profile: 'docker' 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-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: diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml deleted file mode 100644 index a845ee113..000000000 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ /dev/null @@ -1,109 +0,0 @@ ---- -- project: - name: vnfsdk-ice - project-name: 'vnfsdk-ice' - project: 'vnfsdk/ice' - pom: 'pom.xml' - python-version: python3 - stream: - - 'master': - branch: 'master' - subproject: - - 'scripts': - path: 'validation-scripts' - pattern: 'validation-scripts/**' - pom: 'validation-scripts/pom.xml' - tox-dir: 'validation-scripts/' - tox-envs: '' - - 'server': - path: 'ice-server' - pattern: 'ice-server/**' - pom: 'ice-server/pom.xml' - tox-dir: 'ice-server/' - tox-envs: '' - mvn-settings: 'vnfsdk-ice-settings' - build-node: ubuntu1604-builder-4c-4g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{subproject}-python-staging-{stream}' - - '{project-name}-{subproject}-python-release-{stream}' - -- project: - name: vnfsdk-ice-docker - project-name: 'vnfsdk-ice-docker' - 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-builder-4c-4g - 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' - 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 - jobs: - - gerrit-tox-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'vnfsdk/ice' - project-name: 'vnfsdk-ice' - branch: 'master' - mvn-settings: 'vnfsdk-ice-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -- project: - name: vnfsdk-ice-info - jobs: - - gerrit-info-yaml-verify - project: 'vnfsdk/ice' - project-name: 'vnfsdk-ice' - branch: 'master' - mvn-settings: 'vnfsdk-ice-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vnfsdk-ice-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vnfsdk/ice - project-name: 'vnfsdk-ice' - build-node: ubuntu1604-builder-4c-4g - branch: 'master' - mvn-settings: 'vnfsdk-ice-settings' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index c1d2c6c3d..0724f6686 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -25,27 +25,27 @@ archive-artifacts: '' 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-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: diff --git a/jjb/vvp/pre-build-csv.sh b/jjb/vvp/pre-build-csv.sh new file mode 100644 index 000000000..b90f77b86 --- /dev/null +++ b/jjb/vvp/pre-build-csv.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +virtualenv -p python3 $WORKSPACE/venv-tox +source $WORKSPACE/venv-tox/bin/activate +pip3 install --upgrade pip +pip3 install --no-use-pep517 -r requirements.txt +ls +wget -O $WORKSPACE/ice_validator/heat_requirements.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" +echo "Copied newest needs." +cd ice_validator/ +pytest --self-test tests/
\ No newline at end of file diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml deleted file mode 100644 index 24444c8a1..000000000 --- a/jjb/vvp/vvp-cms.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: vvp-project-view - project-name: vvp - views: - - project-view - -- project: - name: vvp-cms - project-name: 'vvp-cms' - project: 'vvp/cms' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-cms-settings' - 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-cms-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-docker-8c-8g - project: 'vvp/cms' - project-name: 'vvp-cms' - branch: 'master' - mvn-settings: 'vvp-cms-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-devkit.yaml b/jjb/vvp/vvp-devkit.yaml deleted file mode 100644 index 5646b02de..000000000 --- a/jjb/vvp/vvp-devkit.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- - -- project: - name: vvp-devkit - project-name: 'vvp-devkit' - project: 'vvp/devkit' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-devkit-settings' - build-node: ubuntu1604-builder-4c-4g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - docker-pom: 'pom.xml' - mvn-profile: 'default' diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml index ca14d1682..338c79be9 100644 --- a/jjb/vvp/vvp-documentation.yaml +++ b/jjb/vvp/vvp-documentation.yaml @@ -3,11 +3,7 @@ name: vvp-documentation project-name: 'vvp-documentation' project: 'vvp/documentation' - rtdproject: 'onap' - stream: - - 'master': - branch: 'master' mvn-settings: 'vvp-documentation-settings' - build-node: ubuntu1604-builder-4c-4g + branch: master jobs: - - gerrit-tox-verify + - gerrit-info-yaml-verify diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml deleted file mode 100644 index 191909048..000000000 --- a/jjb/vvp/vvp-engagementmgr.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -- project: - name: vvp-engagementmgr - project-name: 'vvp-engagementmgr' - project: 'vvp/engagementmgr' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-engagementmgr-settings' - 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-engagementmgr-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-docker-8c-8g - project: 'vvp/engagementmgr' - project-name: 'vvp-engagementmgr' - branch: 'master' - mvn-settings: 'vvp-engagementmgr-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml deleted file mode 100644 index 47c553ea6..000000000 --- a/jjb/vvp/vvp-gitlab.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-gitlab - project-name: 'vvp-gitlab' - project: 'vvp/gitlab' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-gitlab-settings' - 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' diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml deleted file mode 100644 index bdb7bda60..000000000 --- a/jjb/vvp/vvp-image-scanner.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -- project: - name: vvp-image-scanner - project-name: 'vvp-image-scanner' - project: 'vvp/image-scanner' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-image-scanner-settings' - 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-image-scanner-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-docker-8c-8g - project: 'vvp/image-scanner' - project-name: 'vvp-image-scanner' - branch: 'master' - mvn-settings: 'vvp-image-scanner-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml deleted file mode 100644 index 8d46eba02..000000000 --- a/jjb/vvp/vvp-jenkins.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-jenkins - project-name: 'vvp-jenkins' - project: 'vvp/jenkins' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-jenkins-settings' - 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' diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml deleted file mode 100644 index 6a5015443..000000000 --- a/jjb/vvp/vvp-portal.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-portal - project-name: 'vvp-portal' - project: 'vvp/portal' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-portal-settings' - 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' diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml deleted file mode 100644 index 22b60efe8..000000000 --- a/jjb/vvp/vvp-postgresql.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-postgresql - project-name: 'vvp-postgresql' - project: 'vvp/postgresql' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-postgresql-settings' - 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' diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml deleted file mode 100644 index 8dd6cd9a4..000000000 --- a/jjb/vvp/vvp-test-engine.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- project: - name: vvp-test-engine - project-name: 'vvp-engine' - project: 'vvp/test-engine' - stream: - - 'master': - branch: 'master' - subproject: - - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-test-engine-settings' - 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' diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index 94861bd75..5fd4a307c 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -32,3 +32,19 @@ mvn-settings: 'vvp-validation-scripts-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vvp-validation-scripts-tracability-matrix + project: 'vvp/validation-scripts' + project-name: 'vvp-validation-scripts' + mvn-settings: 'vvp-validation-scripts-settings' + mvn-global-settings: 'global-settings' + stream: + - 'master': + branch: 'master' + jobs: + - '{project-name}-{stream}-build-and-upload': + pre_script: !include-raw-escape: pre-build-csv.sh + artifact_name: traceability.csv rst.csv + project_id: org.onap.vvp.validation.scripts + post_script: !include-raw-escape: ../vnfrqts/post-upload-artifact.sh diff --git a/packer/provision/basebuild/.dummy b/packer/provision/basebuild/.dummy deleted file mode 100644 index e69de29bb..000000000 --- a/packer/provision/basebuild/.dummy +++ /dev/null |