diff options
Diffstat (limited to 'jjb')
41 files changed, 177 insertions, 207 deletions
diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml new file mode 100644 index 000000000..0c24a036d --- /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: '^.*-csit-verify.*' + +- view: + name: Daily-Jobs + views: + - csit-view + view-name: Daily-Jobs + view-description: 'List of Daily Jobs' + view-regex: '.*-daily' + +- view: + name: External-Labs + views: + - csit-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/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..ee03706af 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: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index dad7e8b67..88ce906c6 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 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/dcaegen2/dcaegen2-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml index 38216d1e8..38216d1e8 100644 --- a/jjb/dcaegen2/dcaegen2-pmmapper-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml 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-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/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-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.yaml b/jjb/multicloud/multicloud-openstack.yaml index 891a7b43c..1a8bde82e 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,10 @@ path: 'windriver' pattern: 'windriver/**' pom: 'windriver/pom.xml' + - 'windriver_share': + path: 'windriver' + pattern: 'share/**' + pom: 'windriver/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' @@ -84,20 +80,6 @@ # 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-ocata-sonar jobs: - gerrit-maven-sonar 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-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index ba8a08fd2..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: diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 227d01e7b..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' diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index 11c67c034..b012061ad 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -21,8 +21,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-dcae-d-ci-settings' files: '**' archive-artifacts: '' @@ -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 c56cb3a91..f5c613eff 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' files: '**' archive-artifacts: '' @@ -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 bde97066b..16c0a0a4a 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-dcae-d-dt-settings' files: '**' archive-artifacts: '' @@ -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 2fa6f2984..4a273c696 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-dcae-d-fe-settings' files: '**' archive-artifacts: '' @@ -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 353a03f3f..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: '.' @@ -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 22320b819..540da4199 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -12,8 +12,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' 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 aa78e5c56..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: '' @@ -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 51479bd43..d0a110e79 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -45,8 +45,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' @@ -79,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' @@ -96,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/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' - |