diff options
10 files changed, 126 insertions, 4 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg index 88b7dc1f0..791a9b697 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=CentOS 7 - redis - - 260980909-9003 +IMAGE_NAME=CentOS 7 - redis - - 70180101-1009 LABELS=centos7-redis-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index cb0f944a3..18f6feffa 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/deployments' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 3851bb6fc..4973e6dc1 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/platform/deployment-handler' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml new file mode 100644 index 000000000..968487504 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -0,0 +1,31 @@ +--- +- project: + name: dcaegen2-platform-mod-bpgenerator + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + version-properties-file: 'mod/bpgenerator/version.properties' + mvn-pom: 'mod/bpgenerator/pom.xml' + mvn-params: '-f mod/bpgenerator/pom.xml' + pattern: 'mode/bpgenerator/**' + subproject: + - 'bpgenerator': + pom: 'mode/bpgenerator/pom.xml' + pattern: 'bpgenerator/**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml new file mode 100644 index 000000000..2c79e2b1e --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -0,0 +1,34 @@ +--- +- project: + name: dcaegen2-platform-mod-designtool + project-name: dcaegen2-platform-mod + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - designtool: + pom: 'mod/designtool/pom.xml' + pattern: 'mod/designtool/**' + stream: + - 'master': + branch: 'master' + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + + +- project: + name: dcaegen2-platform-mod-designtool-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/utils + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-mod-designtool' + branch: 'master' + mvn-settings: 'dcaegen2-platform-mod-designtool-settings' + diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index e476fbfeb..d94cb2758 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -21,6 +21,20 @@ build-node: ubuntu1604-docker-8c-8g - project: + name: dcaegen2-platform-mod-genprocessor-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod-genprocessor' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/genprocessor/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: name: dcaegen2-platform-mod-genprocessor-clm jobs: - gerrit-maven-clm @@ -31,3 +45,4 @@ mvn-params: '-f mod/genprocessor/pom.xml' branch: 'master' mvn-settings: 'dcaegen2-platform-settings' + diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index a93fd571b..4d6da5365 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/platform/policy-handler' stream: - 'master': diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 8d8b72e07..472325a4d 100755 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -10,9 +10,11 @@ chmod 755 ./pike/docker/*.* chmod 755 ./starlingx/docker/*.* #chmod 755 ./lenovo/docker/*.* chmod 755 ./fcaps/docker/*.* +chmod 755 ./hpa/docker/*.* ./windriver/docker/build_image.sh ./pike/docker/build_image.sh ./starlingx/docker/build_image.sh #./lenovo/docker/build_image.sh ./fcaps/docker/build_image.sh +./hpa/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-openstack-hpa-csit.yaml b/jjb/multicloud/multicloud-openstack-hpa-csit.yaml new file mode 100644 index 000000000..3972d6956 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-hpa-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: multicloud-openstack-hpa-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-hpa' + recipients: 'haibin.huang@intel.com' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index eefdc7721..1df9046d3 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -52,6 +52,10 @@ # path: 'lenovo' # pattern: 'share/**' # pom: 'lenovo/pom.xml' + - 'hpa': + path: 'hpa' + pattern: 'hpa/**' + pom: 'hpa/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' @@ -199,6 +203,25 @@ # mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: + name: multicloud-openstack-hpa-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack-hpa' + branch: 'master' + mvn-params: '-f hpa/pom.xml' + mvn-settings: 'multicloud-openstack-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: name: multicloud-openstack-info project-name: multicloud-openstack jobs: |