diff options
23 files changed, 203 insertions, 153 deletions
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index 64d98f15d..eadcdbe6c 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - mvn-settings: 'dcaegen2-analytics-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: '' + mvn-settings: 'dcaegen2-analytics-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' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 371b5e01d..2f0e8871a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 74d9a243d..f310f5bad 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index cc9fb1f51..2dbee3a32 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - mvn-settings: 'dcaegen2-collectors-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: '' + mvn-settings: 'dcaegen2-collectors-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' diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 1291c4dec..8e4825811 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 616093089..0d4ff25f3 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index 52e7ce37b..86f43212a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -11,11 +11,12 @@ 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: '' + 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' diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index f200bb1df..89ea2fe7d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-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: '' + mvn-settings: 'dcaegen2-platform-cli-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' diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index df4ba7a17..95b2717b4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -17,3 +17,4 @@ - 'release-1.0.0': branch: 'release-1.0.0' mvn-settings: 'dcaegen2-platform-configbinding-settings' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index bdc3c8b40..d0f8db34e 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 67f3fe3f9..bce4863a1 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index 9d29b8318..d617db4f0 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 0104543f5..da23a5982 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 7aceae098..1108cc79d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 594978ea8..2eca1fabb 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 62d24bcc5..c9a81dced 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -11,11 +11,12 @@ stream: - 'master': branch: 'master' - 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 - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' + 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 + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml new file mode 100644 index 000000000..20dbd21f6 --- /dev/null +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -0,0 +1,22 @@ +---
+- project:
+ name: dmaap-messagerouter-mirroragent
+ project-name: 'dmaap-messagerouter-mirroragent'
+ jobs:
+ - '{project-name}-{stream}-clm'
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'dmaap/mirroragent/pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily'
+ mvn-goals: 'clean install'
+ project: 'dmaap/messagerouter/mirroragent'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'release-1.0.0':
+ branch: 'release-1.0.0'
+ mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+ files: '**'
+ archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml new file mode 100644 index 000000000..f5e8c109c --- /dev/null +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: dmaap-messagerouter-msgrtr + project-name: 'dmaap-messagerouter-msgrtr' + jobs: + - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'dmaap/msgrtr/pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + mvn-goals: 'clean install' + project: 'dmaap/messagerouter/msgrtr' + stream: + - 'master': + branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' + mvn-settings: 'dmaap-messagerouter-msgrtr-settings' + files: '**' + archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dmaap/dmaap-messagerouter.yaml b/jjb/dmaap/dmaap-messagerouter.yaml deleted file mode 100644 index a0c806e00..000000000 --- a/jjb/dmaap/dmaap-messagerouter.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: dmaap-messagerouter - project-name: 'dmaap-messagerouter' - project: 'dmaap/messagerouter' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dmaap-messagerouter-settings' - subproject: - - 'Msgrtr': - pom: 'Msgrtr/pom.xml' - pattern: 'Msgrtr/**' - mvn-goals: 'clean install' - - 'dmaap': - pom: 'dmaap/pom.xml' - pattern: 'dmaap/**' - mvn-goals: 'clean install' - - 'dmaapClient': - pom: 'dmaapClient/pom.xml' - pattern: 'dmaapClient/**' - mvn-goals: 'clean install' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - files: '**' - archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml index 44a69f548..770df5417 100644 --- a/jjb/multicloud/multicloud-csit.yaml +++ b/jjb/multicloud/multicloud-csit.yaml @@ -4,10 +4,10 @@ jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'multicloud-framework' + project-name: 'multicloud' stream: 'master' functionality: - - 'provision': + - 'functionality1': trigger_jobs: - '{project-name}-{stream}-multivimbroker-merge-java' robot-options: '' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index fa1911233..1fa18a702 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -11,10 +11,11 @@ - 'newton': path: 'newton' pattern: 'newton/**' + pom: 'newton/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' files: '**' archive-artifacts: '' build-node: 'ubuntu1604-memcached-4c-4g' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml new file mode 100644 index 000000000..4e57d7667 --- /dev/null +++ b/jjb/usecaseui/usecase-ui.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: usecase-ui + project-name: 'usecase-ui' + project: 'usecase-ui' + stream: + - 'master': + branch: 'master' + mvn-settings: 'usecase-ui-settings' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 5880fe6e9..7e6b971a1 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -13,7 +13,7 @@ rh_systems() { yum install -y openssl-devel mysql-devel gcc # Autorelease support packages - yum install -y python-tox xmlstarlet xvfb + yum install -y firefox python-tox xmlstarlet xvfb # Additional libraries for Python ncclient yum install -y libxml2 libxslt libxslt-devel libffi libffi-devel @@ -47,7 +47,7 @@ ubuntu_systems() { apt-get install -y libssl-dev libmysqlclient-dev gcc # Autorelease support packages - apt-get install -y python-tox xmlstarlet xvfb + apt-get install -y firefox python-tox xmlstarlet xvfb # Additional libraries for Python ncclient apt-get install -y wget unzip python-ncclient |