diff options
23 files changed, 155 insertions, 48 deletions
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 index 5b7d179f6..a3bdd73ff 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904 LABELS=ubuntu1604-docker-8c-8g -HARDWARE_ID=v1-standard-4 +HARDWARE_ID=v1-standard-8 diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index d1e97e83a..33c7c23ee 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -5,9 +5,11 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/parent' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index c48deda16..d84218563 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -13,7 +13,8 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: 'ubuntu1604-docker-v1-8c-8g' + build-timeout: 180 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml new file mode 100644 index 000000000..36af8fabf --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml @@ -0,0 +1,13 @@ +- project: + name: dcaegen2-collectors-datafile-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-collectors-datafile' + stream: 'master' + functionality: + - 'ManagementInterface-suite': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 8515d7378..e06166ad0 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -25,3 +25,11 @@ branch: 'beijing' - casablanca: branch: 'casablanca' + +- project: + name: doc-info + project-name: doc + jobs: + - gerrit-info-yaml-verify + project: doc + branch: master diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index bdd15418d..d3021cc8f 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -70,4 +70,12 @@ branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: externalapi-nbi-info + project-name: externalapi-nbi + jobs: + - gerrit-info-yaml-verify + project: externalapi/nbi + branch: master diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml deleted file mode 100644 index 82e03fe04..000000000 --- a/jjb/holmes/holmes-dsa.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: holmes-dsa - project-name: 'holmes-dsa' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g - project: 'holmes/dsa' - stream: - - 'master': - branch: 'master' - mvn-settings: 'holmes-dsa-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g - -- project: - name: holmes-dsa-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'holmes/dsa' - project-name: 'holmes-dsa' - branch: 'master' - mvn-settings: 'holmes-dsa-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: holmes-dsa-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: holmes/dsa - project-name: 'holmes-dsa' - branch: 'master' - mvn-settings: 'holmes-dsa-settings' diff --git a/jjb/integration/integration-devtool.yaml b/jjb/integration/integration-devtool.yaml index 175dffa5a..b656b4fbd 100644 --- a/jjb/integration/integration-devtool.yaml +++ b/jjb/integration/integration-devtool.yaml @@ -14,3 +14,11 @@ branch: 'master' mvn-settings: 'integration-devtool-settings' build-node: ubuntu1604-builder-2c-1g + +- project: + name: integration-devtool-info + project-name: integration-devtool + jobs: + - gerrit-info-yaml-verify + project: integration/devtool + branch: master diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index cb253c666..03480eeb1 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -41,3 +41,11 @@ - 'casablanca': branch: 'casablanca' mvn-settings: 'integration-settings' + +- project: + name: integration-info + project-name: integration + jobs: + - gerrit-info-yaml-verify + project: integration + branch: master diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 5b72b09cd..91a63d8a3 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -57,3 +57,11 @@ build-node: ubuntu1604-docker-8c-8g branch: 'master' mvn-settings: 'modeling-toscaparsers-settings' + +- project: + name: modeling-toscaparsers-javatoscachecker-info + project-name: modeling-toscaparsers-javatoscachecker + jobs: + - gerrit-info-yaml-verify + project: modeling/toscaparsers + branch: master diff --git a/jjb/multicloud/multicloud-k8s-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml new file mode 100644 index 000000000..a5a1540e7 --- /dev/null +++ b/jjb/multicloud/multicloud-k8s-csit.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: multicloud-k8s-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-k8s' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml index 93ccc824a..9630ab3f5 100644 --- a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml @@ -2,6 +2,7 @@ - project: name: multicloud-openstack-fcaps-csit jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-fcaps' stream: 'master' diff --git a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml index 74b087d51..b97abdae1 100644 --- a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml @@ -2,6 +2,7 @@ - project:
name: multicloud-openstack-lenovo-csit
jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'multicloud-lenovo'
stream: 'master'
diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index 8e4b001b0..2daca91e2 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -47,3 +47,11 @@ - shell: !include-raw-escape: oneclick-config-make-tar.sh - shell: !include-raw-escape: oneclick-config-build-docker-image.sh - shell: !include-raw-escape: ../include-docker-push.sh + +- project: + name: oomconfig-info + project-name: oomconfig + jobs: + - gerrit-info-yaml-verify + project: oom + branch: master diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 818d0100b..08380da9d 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -30,3 +30,11 @@ project-name: 'oom-registrator' branch: 'master' mvn-settings: 'oom-registrator-settings' + +- project: + name: oom-registrator-info + project-name: oom-registrator + jobs: + - gerrit-info-yaml-verify + project: oom/registrator + branch: master diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index f854c71d4..953ab7d5c 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -33,3 +33,11 @@ project-name: 'oparent' branch: 'master' mvn-settings: 'oparent-settings' + +- project: + name: oparent-info + project-name: oparent + jobs: + - gerrit-info-yaml-verify + project: oparent + branch: master diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index cba0aba91..d77ea9fe0 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -48,3 +48,11 @@ project-name: 'portal-sdk' branch: 'master' mvn-settings: 'portal-sdk-settings' + +- project: + name: portal-sdk-info + project-name: portal-sdk + jobs: + - gerrit-info-yaml-verify + project: portal/sdk + branch: master diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 9e7305088..e125984e9 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -45,3 +45,11 @@ branch: 'master' build-node: ubuntu1604-builder-4c-4g mvn-settings: 'portal-settings' + +- project: + name: portal-info + project-name: portal + jobs: + - gerrit-info-yaml-verify + project: portal + branch: master diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index faaeb60f9..13f9a9e2b 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -43,3 +43,11 @@ project-name: 'so-libs' branch: 'master' mvn-settings: 'so-libs-settings' + +- project: + name: so-libs-info + project-name: so-libs + jobs: + - gerrit-info-yaml-verify + project: so/libs + branch: master diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 4d3e169c2..5ba7b2d7b 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -55,3 +55,11 @@ - 'casablanca': branch: 'casablanca' mvn-settings: 'so-settings' + +- project: + name: so-info + project-name: so + jobs: + - gerrit-info-yaml-verify + project: so + branch: master diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index b97a5528d..92e4eb78e 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -44,3 +44,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-server-settings' + +- project: + name: usecase-ui-server-info + project-name: usecase-ui-server + jobs: + - gerrit-info-yaml-verify + project: usecase-ui/server + branch: master diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 0de519538..d0e8809f5 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -36,3 +36,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-settings' + +- project: + name: usecase-ui-info + project-name: usecase-ui + jobs: + - gerrit-info-yaml-verify + project: usecase-ui + branch: master diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 997965db6..057b2ef8a 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -77,3 +77,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vid-settings' + +- project: + name: vid-info + project-name: vid + jobs: + - gerrit-info-yaml-verify + project: vid + branch: master |