diff options
9 files changed, 14 insertions, 74 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg index a997a04e4..52ffcd9c5 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181 LABELS=ubuntu1804-docker-v1-8c-8g HARDWARE_ID=v1-standard-8 -VOLUME_SIZE=20 +VOLUME_SIZE=50 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg index c8c65cf1b..cc1ec6ba6 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=Ubuntu 18.04 - memcached - - 120780707-7003 LABELS=ubuntu1804-memcached-4c-4g HARDWARE_ID=v2-highcpu-4 -VOLUME_SIZE=20 +VOLUME_SIZE=50 diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml deleted file mode 100644 index e0e4c059f..000000000 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- project: - name: dcaegen2-analytics-tca - - # job template iterators - project-name: 'dcaegen2-analytics-tca' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - # apply to all jobs - project: 'dcaegen2/analytics/tca' - mvn-settings: 'dcaegen2-analytics-tca-settings' - files: '**' - maven-deploy-properties: | - deployAtEnd=true - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - jobs: - - '{project-name}-{stream}-verify-java': - mvn-params: '-DskipTests=true' - - '{project-name}-{stream}-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 - mvn-params: '-DskipTests=true' - -- project: - name: dcaegen2-analytics-tca-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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'dcaegen2/analytics/tca' - project-name: 'dcaegen2-analytics-tca' - branch: 'master' - mvn-settings: 'dcaegen2-analytics-tca-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-analytics-tca-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'dcaegen2/analytics/tca' - project-name: 'dcaegen2-analytics-tca' - branch: 'master' - build-node: ubuntu1804-builder-4c-4g - mvn-settings: 'dcaegen2-analytics-tca-settings' - -- project: - name: dcaegen2-analytics-tca-info - project-name: dcaegen2-analytics-tca - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dcaegen2/analytics/tca - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 889623774..4586ab144 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -55,6 +55,7 @@ - project: name: dcaegen2-collectors-ves-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 468b07a86..5b8fc9819 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -13,6 +13,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-settings' @@ -44,6 +45,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-settings' @@ -75,6 +77,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-settings' @@ -86,6 +89,7 @@ - project: name: dcaegen2-services-datalake-handler-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 323311824..d28e62eb0 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 mvn-settings: 'multicloud-framework-settings' subproject: - 'multivimbroker': @@ -102,6 +103,7 @@ project: 'multicloud/framework' project-name: 'multicloud-framework-artifactbroker' branch: 'master' + java-version: openjdk11 mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' mvn-goals: 'clean install' @@ -115,5 +117,6 @@ project: multicloud/framework project-name: 'multicloud-framework-artifactbroker' branch: 'master' + java-version: openjdk11 mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml index 5cf656acf..33d89f943 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml @@ -11,5 +11,5 @@ functionality: - "certservice": trigger_jobs: - - "{project-name}-{stream}-merge-java" + - "oom-platform-cert-service-{stream}-merge-java" robot-options: "" diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml index 99a63873b..5bcd5f327 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -69,10 +69,12 @@ - project: name: oom-platform-cert-service-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: 'oom/platform/cert-service' + project: oom/platform/cert-service project-name: 'oom-platform-cert-service' branch: 'master' + build-node: ubuntu1804-docker-8c-8g mvn-settings: 'oom-platform-cert-service-settings' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 2c5a06aaf..d21433429 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -37,7 +37,6 @@ branch: 'Dynamic_BPMN' java-version: openjdk11 mvn-settings: 'so-settings' - java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-v1-8c-8g |