From: Jessica Wagantall Date: Thu, 13 Aug 2020 17:52:03 +0000 (+0000) Subject: Merge "Fix SDC view" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=386dbd8331c30762ff85bdfdd4b5fb5acfc62e9e;hp=ad24e4618028943d8d8ba866ef4d8d3dd87ea7fe;p=ci-management.git Merge "Fix SDC view" --- diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index 1ec847026..bd734c760 100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -41,7 +41,7 @@ Once you successfully clone the repository, next step is to install JJB ``` cd ci-management -sudo apt-get install python-virtualenv +pip install virtualenv virtualenv onap_sandbox source onap_sandbox/bin/activate pip install jenkins-job-builder diff --git a/global-jjb b/global-jjb index 0c2d2eea3..762400ee2 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 0c2d2eea337b2700a7913d03aa5afd75d0c11b93 +Subproject commit 762400ee2c77d0cb936ca1757bc2ac1515042436 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index a5b4bd9d0..f85063238 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 LABELS=centos7-builder-2c-1g HARDWARE_ID=v2-highcpu-2 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg index 209cb0e97..9d757fded 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 LABELS=centos7-builder-4c-4g HARDWARE_ID=v2-highcpu-4 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg index edbfd3426..73ebed052 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200224-195343.324 LABELS=centos7-docker-8c-8g HARDWARE_ID=v2-highcpu-8 +VOLUME_SIZE=20 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 791a9b697..f84207f0e 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,4 @@ -IMAGE_NAME=CentOS 7 - redis - - 70180101-1009 +IMAGE_NAME=CentOS 7 - redis - - 50880808-8011 LABELS=centos7-redis-4c-4g HARDWARE_ID=v2-highcpu-4 +VOLUME_SIZE=50 diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg index 2b0ca1245..5695a77d1 100644 --- a/jenkins-config/clouds/openstack/cattle/cloud.cfg +++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg @@ -5,7 +5,8 @@ CLOUD_IGNORE_SSL=false CLOUD_ZONE=ca-ymq-1 # Default Template Configuration -IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180601-1002 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200224-191258.235 +VOLUME_SIZE=20 HARDWARE_ID=v1-standard-1 NETWORK_ID=bd089be9-e846-4afe-905b-8bb6c7c90faf USER_DATA_ID=jenkins-init-script diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg index 37a375a0a..817e6812f 100644 --- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg @@ -4,3 +4,4 @@ HARDWARE_ID=v2-highcpu-4 INSTANCE_CAP=1 NUM_EXECUTORS=4 RETENTION_TIME=4320 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index 7b9af8f46..a8d9328a2 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200219-191621.319 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200720-175313.316 LABELS=ubuntu1804-builder-4c-4g HARDWARE_ID=v2-highcpu-4 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg new file mode 100644 index 000000000..5f1844a82 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg @@ -0,0 +1,4 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181 +LABELS=ubuntu1804-docker-8c-16g +HARDWARE_ID=v2-highcpu-16 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg index c4d05ac87..dc4d62f84 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -1,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181 LABELS=ubuntu1804-docker-8c-8g HARDWARE_ID=v2-highcpu-8 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg index 5e1900178..e49f0a689 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944 LABELS=ubuntu1804-docker-arm64-4c-2g HARDWARE_ID=lf-standard-2 +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg index 5ece27518..90de5db54 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944 LABELS=ubuntu1804-docker-arm64-4c-4g HARDWARE_ID=lf-standard-4 +VOLUME_SIZE=20 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 da8a241ea..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,3 +1,4 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200219-195603.229 +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=50 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg index d69e20940..214356f42 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - - 20200506-233718.921 LABELS=ubuntu1804-helm-2c-1g HARDWARE_ID=v2-highcpu-2 +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 6d2f06e38..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,3 +1,4 @@ -IMAGE_NAME=Ubuntu 18.04 - memcached - - 120380303-3010 +IMAGE_NAME=Ubuntu 18.04 - memcached - - 120780707-7003 LABELS=ubuntu1804-memcached-4c-4g HARDWARE_ID=v2-highcpu-4 +VOLUME_SIZE=50 diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml index 9f3b17979..078e0b62e 100644 --- a/jjb/aaf/aaf-certservice-csit.yaml +++ b/jjb/aaf/aaf-certservice-csit.yaml @@ -6,8 +6,8 @@ - "{project-name}-{stream}-csit-{functionality}" project-name: "aaf" stream: - - "master": - branch: "master" + - "frankfurt": + branch: "frankfurt" functionality: - "certservice": trigger_jobs: diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml index 69a24a81d..8aa7518bd 100644 --- a/jjb/aaf/aaf-certservice.yaml +++ b/jjb/aaf/aaf-certservice.yaml @@ -4,8 +4,8 @@ name: aaf-certservice project-name: 'aaf-certservice' stream: - - 'master': - branch: 'master' + - 'frankfurt': + branch: 'frankfurt' java-version: openjdk11 project: 'aaf/certservice' mvn-settings: 'aaf-certservice-settings' @@ -48,7 +48,7 @@ build-node: ubuntu1804-docker-8c-8g project: 'aaf/certservice' project-name: 'aaf-certservice' - branch: 'master' + branch: 'frankfurt' mvn-settings: 'aaf-certservice-settings' mvn-pom: 'certService/pom.xml' mvn-goals: 'clean install' @@ -61,4 +61,4 @@ - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g project: aaf/certservice - branch: master + branch: frankfurt diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml index 62ed2fda7..599754303 100644 --- a/jjb/aaf/aaf-sms.yaml +++ b/jjb/aaf/aaf-sms.yaml @@ -24,6 +24,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'aaf-sms-settings' files: '**' archive-artifacts: '' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index a6a182aa0..1f8078f23 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -30,6 +30,36 @@ files: '**' archive-artifacts: '' +- project: + name: aai-graphgraph-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: 'aai/graphgraph' + project-name: 'aai-graphgraph' + branch: 'master' + mvn-settings: 'aai-graphgraph-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: aai-graphgraph-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'aai/graphgraph' + project-name: 'aai-graphgraph' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-graphgraph-settings' + - project: name: aai-graphgraph-info project-name: aai-graphgraph @@ -38,4 +68,3 @@ build-node: centos7-builder-2c-1g project: aai/graphgraph branch: master - diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml new file mode 100644 index 000000000..71ffd5488 --- /dev/null +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -0,0 +1,45 @@ +--- +- project: + name: ccsdk-oran + project-name: 'ccsdk-oran' + jobs: + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g + sign-artifacts: true + maven-versions-plugin: true + cron: '' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-Dmaven.test.skip=true -P docker' + maven-version: "mvn35" + maven-versions-plugin: true + cron: '@daily' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'ccsdk/oran' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-oran-settings' + files: '**' + archive-artifacts: '' + maven-version: "mvn35" + java-version: openjdk11 + docker-pom: 'pom.xml' + mvn-profile: docker + build-node: ubuntu1804-docker-8c-8g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + +- project: + name: ccsdk-oran-info + project: ccsdk/oran + project-name: ccsdk-oran + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index be94c4f07..47e616bf6 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-distribution-settings' diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml deleted file mode 100644 index 6a943f0cd..000000000 --- a/jjb/ccsdk/platform-plugins.yaml +++ /dev/null @@ -1,82 +0,0 @@ ---- -- project: - name: ccsdk-platform-plugins - project-name: 'ccsdk-platform-plugins' - jobs: - - gerrit-maven-verify - - gerrit-maven-merge: - cron: '@daily' - - gerrit-maven-stage: - build-node: centos7-builder-4c-4g - sign-artifacts: true - cron: '' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'ccsdk/platform/plugins' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-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: centos7-redis-4c-4g - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - -- project: - name: ccsdk-platform-plugins-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: centos7-redis-4c-4g - project: 'ccsdk/platform/plugins' - project-name: 'ccsdk-platform-plugins' - branch: 'master' - mvn-settings: 'ccsdk-platform-plugins-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: ccsdk-platform-plugins-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'ccsdk/platform/plugins' - project-name: 'ccsdk-platform-plugins' - stream: - - 'master': - branch: 'master' - mvn-settings: 'ccsdk-platform-plugins-settings' - build-node: centos7-redis-4c-4g - - -- project: - name: ccsdk-platform-plugins-info - project-name: ccsdk-platform-plugins - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: ccsdk/platform/plugins - branch: master - -- project: - name: ccsdk-platform-plugins-whitesource - project-name: ccsdk-platform-plugins - jobs: - - gerrit-whitesource-scan - mvn-settings: 'ccsdk-platform-plugins-settings' - wss-product-name: ccsdk - mvn-clean-install: true - project: ccsdk/platform/plugins - branch: master diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 79b4853f8..7115b5d36 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -16,6 +16,7 @@ - centos-7 - ubuntu-18.04 templates: builder + update-cloud-image: true - project: name: packer-docker-jobs @@ -35,6 +36,7 @@ - ubuntu-18.04-arm64 - ubuntu-18.04 templates: docker + update-cloud-image: true - project: name: packer-memcached-jobs @@ -52,6 +54,7 @@ platforms: - ubuntu-18.04 templates: memcached + update-cloud-image: true - project: name: packer-redis-jobs @@ -68,6 +71,7 @@ platforms: - centos-7 templates: redis + update-cloud-image: true - project: name: packer-helm-jobs @@ -84,3 +88,4 @@ platforms: - ubuntu-18.04 templates: helm + update-cloud-image: true diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 8b4d6e5bb..d3108194b 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -35,3 +35,23 @@ https://jenkins.onap.org https://jenkins.onap.org/sandbox openstack-cloud: vex + +- project: + name: openstack-update-cloud-images + jobs: + - gerrit-openstack-update-cloud-image + + project: ci-management + project-name: ci-management + branch: master + archive-artifacts: '**/*.log' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + build-node: centos7-builder-2c-1g + # update-cloud-image: true + build-timeout: 10 + + gerrit-user: "jenkins-$SILO" + gerrit-host: "gerrit.onap.org" + gerrit-topic: "update-cloud-image" + reviewers-email: "onap-jobbuilder@jenkins.onap.org" diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index 67b3f67f4..b9d79c89f 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -19,7 +19,8 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - '{project-name}-{stream}-verify-java-checkstyle': - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + build-node: ubuntu1804-docker-8c-16g - '{project-name}-{stream}-merge-properties-java': mvn_properties: - docker.pull.registry=nexus3.onap.org:10001 diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 0737cbd16..6d3327f90 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' # apply to all jobs @@ -33,6 +34,7 @@ maven-versions-plugin: true - project: name: dcaegen2-analytics-tca-gen2-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -51,6 +53,7 @@ - project: name: dcaegen2-analytics-tca-gen2-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -62,6 +65,7 @@ - project: name: dcaegen2-analytics-tca-gen2-info + java-version: openjdk11 project-name: dcaegen2-analytics-tca-gen2 jobs: - gerrit-info-yaml-verify 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-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 3f4f91155..f1af9752b 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' # apply to all jobs @@ -47,6 +48,7 @@ project: 'dcaegen2/collectors/datafile' project-name: 'dcaegen2-collectors-datafile' branch: 'master' + java-version: openjdk11 mvn-settings: 'dcaegen2-collectors-datafile-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -60,6 +62,7 @@ build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-collectors-datafile' branch: 'master' + java-version: openjdk11 mvn-settings: 'dcaegen2-collectors-datafile-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 7c72a1676..860bcbf9b 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -2,6 +2,7 @@ - project: name: dcaegen2-collectors-restconf project-name: 'dcaegen2-collectors-restconf' + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -35,6 +36,7 @@ - project: name: dcaegen2-collectors-restconf-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -53,6 +55,7 @@ - project: name: dcaegen2-collectors-restconf-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -65,6 +68,7 @@ - project: name: dcaegen2-collectors-restconf-info project-name: dcaegen2-collectors-restconf + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g 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-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 61c27fcb1..221e0f521 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -33,19 +33,24 @@ - project: name: dcaegen2-platform-configbinding-sonar - project: dcaegen2/platform/configbinding - project-name: dcaegen2-platform-configbinding + jobs: + - gerrit-tox-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-docker-8c-8g - # Sonar jobs use maven to push report - mvn-settings: dcaegen2-platform-configbinding-settings - mvn-goals: 'clean test' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - branch: master + project: 'dcaegen2/platform/configbinding' + project-name: 'dcaegen2-platform-configbinding' + branch: 'master' # used by tox-install.sh to specify the interpreter used to install tox python-version: python3 - jobs: - - gerrit-tox-sonar + mvn-settings: 'dcaegen2-platform-configbinding-settings' + mvn-goals: 'clean test' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + - project: name: dcaegen2-platform-configbinding-info diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 381396873..69d3ba1a1 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -21,6 +21,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-platform-inventory-api-settings' @@ -35,6 +36,7 @@ - project: name: dcaegen2-platform-inventory-api-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -53,6 +55,7 @@ - project: name: dcaegen2-platform-inventory-api-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml index abea091ef..29e79c151 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -15,6 +15,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: dcaegen2-platform-settings @@ -24,6 +25,7 @@ - project: name: dcaegen2-platform-mod-runtimeapi-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -43,6 +45,7 @@ - project: name: dcaegen2-platform-mod-runtimeapi-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 4f5f99764..affa258c4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -21,6 +21,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' @@ -38,6 +39,7 @@ jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' + java-version: openjdk11 project: dcaegen2/platform/servicechange-handler build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-platform-servicechange-handler' 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/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 6690f2037..cde857bc3 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -2,6 +2,7 @@ - project: name: dcaegen2-services-mapper project-name: 'dcaegen2-services-mapper' + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -32,6 +33,7 @@ - project: name: dcaegen2-services-mapper-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -50,6 +52,7 @@ - project: name: dcaegen2-services-mapper-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -62,6 +65,7 @@ - project: name: dcaegen2-services-mapper-info project-name: dcaegen2-services-mapper + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml old mode 100644 new mode 100755 index 2791c379a..55c5e90db --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' # apply to all jobs @@ -47,6 +48,7 @@ project: 'dcaegen2/services/pm-mapper' project-name: 'dcaegen2-services-pm-mapper' branch: 'master' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-pm-mapper-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -60,6 +62,7 @@ build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-services-pm-mapper' branch: 'master' + java-version: openjdk11 mvn-settings: 'dcaegen2-services-pm-mapper-settings' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml new file mode 100644 index 000000000..4d07ea6bd --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -0,0 +1,86 @@ +--- +- project: + name: dcaegen2-services-slice-analysis-ms-verify + project-name: 'dcaegen2-services' + project: 'dcaegen2/services' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + subproject: + - 'slice-analysis-ms': + pom: 'components/slice-analysis-ms/pom.xml' + pattern: 'components/slice-analysis-ms/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: 'dcaegen2-services-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-slice-analysis-ms-release + project-name: 'dcaegen2-services-slice-analysis-ms' + project: 'dcaegen2/services' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-pom: 'components/slice-analysis-ms/pom.xml' + mvn-params: '-f components/slice-analysis-ms/pom.xml' + pattern: 'components/slice-analysis-ms/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build -DpushImageTag' + pattern: 'components/slice-analysis-ms/**' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: 'dcaegen2-services-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + maven-deploy-properties: | + deployAtEnd=true + +- project: + name: dcaegen2-services-slice-analysis-ms-sonar + java-version: openjdk11 + 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-docker-8c-8g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-slice-analysis-ms' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + mvn-goals: 'clean install' + mvn-params: '-f components/slice-analysis-ms/pom.xml' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-slice-analysis-ms-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/services + build-node: ubuntu1804-docker-8c-8g + project-name: 'dcaegen2-services-slice-analysis-ms-clm' + mvn-params: '-f components/slice-analysis-ms/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml new file mode 100644 index 000000000..08579e64c --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml @@ -0,0 +1,15 @@ +- project: + name: dcaegen2-services-son-handler-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-services-son-handler' + recipients: 'vv770d@att.com' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index d536d1a34..c400367d9 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -21,6 +21,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-son-handler-settings' @@ -32,6 +33,7 @@ - project: name: dcaegen2-services-son-handler-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -50,6 +52,7 @@ - project: name: dcaegen2-services-son-handler-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -61,6 +64,7 @@ - project: name: dcaegen2-services-son-handler-info + java-version: openjdk11 project-name: dcaegen2-services-son-handler jobs: - gerrit-info-yaml-verify diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index ea7bcaf8c..e7bf8fba5 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'demo-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index b20bbc5e0..39a6a379c 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -6,7 +6,7 @@ - project-view - project: - name: dmaap-buscontroller + name: dmaap-buscontroller-java11 project-name: 'dmaap-buscontroller' jobs: - '{project-name}-{stream}-verify-java' @@ -18,15 +18,36 @@ container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'dmaap/buscontroller' stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' + java-version: openjdk11 +- project: + name: dmaap-buscontroller-java8 + project-name: 'dmaap-buscontroller' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-goals: 'clean package -P docker docker:build docker:push' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dmaap/buscontroller' + stream: + - 'elalto': + branch: 'elalto' + mvn-settings: 'dmaap-buscontroller-settings' + files: '**' + archive-artifacts: '' + java-version: openjdk8 # removed sonar job from this template because this repo only builds a docker container # and the 0% coverage report from Sonar was causing repeated escalations. diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 38f4a5f9b..4eeafa958 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -1,6 +1,6 @@ --- - project: - name: dmaap-dbcapi + name: dmaap-dbcapi-java11 project-name: 'dmaap-dbcapi' jobs: - '{project-name}-{stream}-verify-java' @@ -11,13 +11,38 @@ maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'dmaap/dbcapi' mvn-settings: 'dmaap-dbcapi-settings' java-version: openjdk11 stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' + # 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: '' + +- project: + name: dmaap-dbcapi-java8 + project-name: 'dmaap-dbcapi' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/dbcapi' + mvn-settings: 'dmaap-dbcapi-settings' + java-version: openjdk8 + stream: + - 'elalto': + branch: 'elalto' # 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 @@ -26,6 +51,7 @@ files: '**' archive-artifacts: '' + - project: name: dmaap-dbcapi-sonar jobs: diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 636c3d27d..c71411251 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -18,8 +18,6 @@ rtdproject: 'onap/58810/' mvn-settings: 'doc-settings' stream: - - master: - branch: 'master' - amsterdam: branch: 'amsterdam' - beijing: @@ -30,8 +28,6 @@ branch: 'dublin' - elalto: branch: 'elalto' - - frankfurt: - branch: 'frankfurt' - project: name: doc-info diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 9c70eec4f..13afecf1c 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -495,6 +495,15 @@ Golang 1.12 +- wrapper: + name: golang114 + wrappers: + - raw: + xml: | + + Golang 1.14 + + - wrapper: # This wrapper is required for all jobs as it configures the wrappers # needed by the eCOMP infra. diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 7224b759e..da5dfdccc 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -451,6 +451,11 @@ <<: *merge_java_defaults name: '{project-name}-{stream}-merge-properties-java' + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + - job-template: # Job template for Java merge jobs that takes a maven template # @@ -515,6 +520,7 @@ project-type: freestyle node: '{build-node}' disabled: '{disabled}' + java-version: openjdk8 properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -550,6 +556,9 @@ builders: - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: "{java-version}" + - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 9b6824cbe..94f6deffb 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -15,9 +15,10 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - + java-version: openjdk11 project: 'holmes/common' stream: - 'master': @@ -26,6 +27,7 @@ files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g + java-version: openjdk11 - project: name: holmes-common-sonar @@ -44,6 +46,7 @@ mvn-settings: 'holmes-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-common-clm @@ -54,6 +57,7 @@ project-name: 'holmes-common' branch: 'master' mvn-settings: 'holmes-common-settings' + java-version: openjdk11 - project: name: holmes-common-info diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index f9c19be69..85322581e 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -9,11 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + java-version: openjdk11 project: 'holmes/engine-management' stream: - 'master': @@ -24,6 +27,7 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1804-builder-4c-4g + java-version: openjdk11 - project: name: holmes-engine-management-sonar @@ -42,6 +46,7 @@ mvn-settings: 'holmes-engine-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-engine-management-clm @@ -52,6 +57,7 @@ project-name: 'holmes-engine-management' branch: 'master' mvn-settings: 'holmes-engine-management-settings' + java-version: openjdk11 - project: name: holmes-engine-management-info diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 347c6b75c..9aa9c9dbe 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -9,11 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + java-version: openjdk11 project: 'holmes/rule-management' stream: - 'master': @@ -24,6 +27,7 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1804-builder-4c-4g + java-version: openjdk11 - project: name: holmes-rule-management-sonar @@ -42,6 +46,7 @@ mvn-settings: 'holmes-rule-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-rule-management-clm @@ -52,6 +57,7 @@ project-name: 'holmes-rule-management' branch: 'master' mvn-settings: 'holmes-rule-management-settings' + java-version: openjdk11 - project: name: holmes-rule-management-info diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 11680b6b0..10b0437ab 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -65,6 +65,7 @@ vagrant plugin install vagrant-libvirt vagrant plugin install vagrant-disksize vagrant plugin install vagrant-sshfs + vagrant plugin install vagrant-reload mkdir -p ~/.ssh - builder: diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml new file mode 100644 index 000000000..30a356903 --- /dev/null +++ b/jjb/integration/integration-seccom.yaml @@ -0,0 +1,37 @@ +--- +- project: + name: integration-seccom-info + project-name: integration-seccom + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/seccom + branch: master + +- project: + name: integration-seccom-linters + project: integration/seccom + project-name: integration-seccom + python-version: python3 + jobs: + - integration-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 61d09d7d7..622d523a7 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -44,7 +44,7 @@ publishers: - lf-infra-publish -- job-template: +- job-template: &tox_verify_boilerplate # Job template for running linters against specific file formats # # Required Variables: @@ -98,3 +98,9 @@ publishers: - lf-infra-publish + +- job-template: + <<: *tox_verify_boilerplate + name: '{project-name}-{stream}-{subproject}-tox-verify' + id: integration-tox-verify + description: 'Job intended for running tox' diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 5b211d745..d88fe02c5 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -46,7 +46,7 @@ name: integration-verify-golang project-name: 'integration' project: 'integration' - golangver: 'golang112' + golangver: 'golang114' mvn-settings: 'integration-settings' archive-artifacts: '' jobs: diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index ec0f970d1..481aca909 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -60,6 +60,22 @@ project: integration/simulators/pnf-simulator branch: master +- project: + name: integration-simulators-pnf-simulator-cli + project: integration/simulators/pnf-simulator + project-name: integration-pnf-simulator + python-version: python3 + jobs: + - integration-tox-verify + subproject: + - 'simulator-cli': + tox-dir: 'simulator-cli' + tox-envs: 'pytest' + pattern: '**/*' + stream: + - 'master': + branch: 'master' + - project: name: integration-simulators-pnf-simulator-linters project: integration/simulators/pnf-simulator diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 857696320..8544cad55 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -35,3 +35,97 @@ stream: - 'master': branch: 'master' + +- project: + name: integration-xtesting-release + project-name: 'integration-xtesting' + project: 'integration/docker/onap-python' + mvn-settings: 'integration-settings' + jobs: + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + +- project: + name: 'integration-xtesting-docker' + jobs: + - gerrit-docker-verify: + project-name: 'integration-xtesting-infra-healthcheck' + docker-root: ./infra-healthcheck + docker-name: 'onap/xtesting-infra-healthcheck' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-infra-healthcheck' + docker-root: ./infra-healthcheck + docker-name: 'onap/xtesting-infra-healthcheck' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-healthcheck' + docker-root: ./healthcheck + docker-name: 'onap/xtesting-healthcheck' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-healthcheck' + docker-root: ./healthcheck + docker-name: 'onap/xtesting-healthcheck' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-smoke-usecases-pythonsdk' + docker-root: ./smoke-usecases-pythonsdk + docker-name: 'onap/xtesting-smoke-usecases-pythonsdk' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-smoke-usecases-pythonsdk' + docker-root: ./smoke-usecases-pythonsdk + docker-name: 'onap/xtesting-smoke-usecases-pythonsdk' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-smoke-usecases-robot' + docker-root: ./smoke-usecases-robot + docker-name: 'onap/xtesting-smoke-usecases-robot' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-smoke-usecases-robot' + docker-root: ./smoke-usecases-robot + docker-name: 'onap/xtesting-smoke-usecases-robot' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-benchmarking' + docker-root: ./benchmarking + docker-name: 'onap/xtesting-benchmarking' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-benchmarking' + docker-root: ./benchmarking + docker-name: 'onap/xtesting-benchmarking' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-candidate-usecases' + docker-root: ./candidate-usecases + docker-name: 'onap/xtesting-candidate-usecases' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-candidate-usecases' + docker-root: ./candidate-usecases + docker-name: 'onap/xtesting-candidate-usecases' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-security' + docker-root: ./security + docker-name: 'onap/xtesting-security' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-security' + docker-root: ./security + docker-name: 'onap/xtesting-security' + docker-build-args: '-f ./docker/Dockerfile' + project: 'integration/xtesting' + stream: + - 'master': + branch: 'master' + files: '' + - 'frankfurt': + branch: 'frankfurt' + files: '' + docker-root: '$WORKSPACE' + mvn-settings: 'integration-settings' + build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/lf-infra-sandbox-3.yaml b/jjb/lf-infra-sandbox-3.yaml new file mode 100644 index 000000000..6f496d5bb --- /dev/null +++ b/jjb/lf-infra-sandbox-3.yaml @@ -0,0 +1,9 @@ +--- +- project: + name: sandbox-3 + project-name: sandbox-3 + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: sandbox-3 + branch: master diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml deleted file mode 100644 index 085788f3f..000000000 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml +++ /dev/null @@ -1,85 +0,0 @@ ---- -- project: - name: logging-analytics-pomba-pomba-aai-context-builder - project-name: logging-analytics-pomba-pomba-aai-context-builder - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: logging-analytics/pomba/pomba-aai-context-builder - stream: - - 'master': - branch: 'master' - - mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - maven-version: 'mvn35' - -#- project: -# name: logging-analytics-pomba-pomba-arm64-aai-context-builder -# project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder -# jobs: -# - '{project-name}-{stream}-docker-java-daily': -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# project: logging-analytics/pomba/pomba-aai-context-builder -# stream: -# - 'master': -# branch: 'master' -# -# mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# maven-version: 'mvn35' -# -- project: - name: logging-analytics-pomba-pomba-aai-context-builder-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: logging-analytics/pomba/pomba-aai-context-builder - project-name: logging-analytics-pomba-pomba-aai-context-builder - branch: master - mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: 'mvn35' - -- project: - name: logging-analytics-pomba-pomba-aai-context-builder-info - project-name: 'logging-analytics-pomba-pomba-aai-context-builder' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'logging-analytics/pomba/pomba-aai-context-builder' - branch: 'master' - -- project: - name: logging-analytics-pomba-pomba-aai-context-builder-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: logging-analytics/pomba/pomba-aai-context-builder - project-name: logging-analytics-pomba-pomba-aai-context-builder - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml deleted file mode 100644 index 0130f17b7..000000000 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- project: - name: logging-analytics-pomba-pomba-audit-common - project-name: logging-analytics-pomba-pomba-audit-common - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: logging-analytics/pomba/pomba-audit-common - stream: - - 'master': - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-audit-common-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: logging-analytics-pomba-pomba-audit-common-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: logging-analytics/pomba/pomba-audit-common - project-name: logging-analytics-pomba-pomba-audit-common - branch: master - mvn-settings: logging-analytics-pomba-pomba-audit-common-settings - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: logging-analytics-pomba-pomba-audit-common-info - project-name: 'logging-analytics-pomba-pomba-audit-common' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'logging-analytics/pomba/pomba-audit-common' - branch: 'master' - -- project: - name: logging-analytics-pomba-pomba-audit-common-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: logging-analytics/pomba/pomba-audit-common - project-name: logging-analytics-pomba-pomba-audit-common - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-audit-common-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml deleted file mode 100644 index 0fed02406..000000000 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml +++ /dev/null @@ -1,65 +0,0 @@ ---- -- project: - name: logging-analytics-pomba-pomba-context-aggregator - project-name: logging-analytics-pomba-pomba-context-aggregator - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: logging-analytics/pomba/pomba-context-aggregator - stream: - - 'master': - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - maven-version: 'mvn35' - -- project: - name: logging-analytics-pomba-pomba-context-aggregator-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: logging-analytics/pomba/pomba-context-aggregator - project-name: logging-analytics-pomba-pomba-context-aggregator - branch: master - mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: 'mvn35' - -- project: - name: logging-analytics-pomba-pomba-context-aggregator-info - project-name: 'logging-analytics-pomba-pomba-context-aggregator' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'logging-analytics/pomba/pomba-context-aggregator' - branch: 'master' - -- project: - name: logging-analytics-pomba-pomba-context-aggregator-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: logging-analytics/pomba/pomba-context-aggregator - project-name: logging-analytics-pomba-pomba-context-aggregator - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml deleted file mode 100644 index bc760c07b..000000000 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml +++ /dev/null @@ -1,85 +0,0 @@ ---- -- project: - name: logging-analytics-pomba-pomba-network-discovery-context-builder - project-name: logging-analytics-pomba-pomba-network-discovery-context-builder - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: logging-analytics/pomba/pomba-network-discovery-context-builder - stream: - - 'master': - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - maven-version: 'mvn35' - -#- project: -# name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder -# project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder -# jobs: -# - '{project-name}-{stream}-docker-java-daily': -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# project: logging-analytics/pomba/pomba-network-discovery-context-builder -# stream: -# - 'master': -# branch: 'master' -# - 'casablanca': -# branch: 'casablanca' -# mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# maven-version: 'mvn35' -# -- project: - name: logging-analytics-pomba-pomba-network-discovery-context-builder-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: logging-analytics/pomba/pomba-network-discovery-context-builder - project-name: logging-analytics-pomba-pomba-network-discovery-context-builder - branch: master - mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: 'mvn35' - -- project: - name: logging-analytics-pomba-pomba-network-discovery-context-builder-info - project-name: 'logging-analytics-pomba-pomba-network-discovery-context-builder' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'logging-analytics/pomba/pomba-network-discovery-context-builder' - branch: 'master' - -- project: - name: logging-analytics-pomba-pomba-network-discovery-context-builder-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: logging-analytics/pomba/pomba-network-discovery-context-builder - project-name: logging-analytics-pomba-pomba-network-discovery-context-builder - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml deleted file mode 100644 index 17c419838..000000000 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml +++ /dev/null @@ -1,83 +0,0 @@ ---- -- project: - name: logging-analytics-pomba-pomba-sdc-context-builder - project-name: logging-analytics-pomba-pomba-sdc-context-builder - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: logging-analytics/pomba/pomba-sdc-context-builder - stream: - - 'master': - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - maven-version: 'mvn35' - -#- project: -# name: logging-analytics-pomba-pomba-arm64-sdc-context-builder -# project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder -# jobs: -# - '{project-name}-{stream}-docker-java-daily': -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# project: logging-analytics/pomba/pomba-sdc-context-builder -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# maven-version: 'mvn35' -# -- project: - name: logging-analytics-pomba-pomba-sdc-context-builder-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: logging-analytics/pomba/pomba-sdc-context-builder - project-name: logging-analytics-pomba-pomba-sdc-context-builder - branch: master - mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: 'mvn35' - -- project: - name: logging-analytics-pomba-pomba-sdc-context-builder-info - project-name: 'logging-analytics-pomba-pomba-sdc-context-builder' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'logging-analytics/pomba/pomba-sdc-context-builder' - branch: 'master' - -- project: - name: logging-analytics-pomba-pomba-sdc-context-builder-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: logging-analytics/pomba/pomba-sdc-context-builder - project-name: logging-analytics-pomba-pomba-sdc-context-builder - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml deleted file mode 100644 index 4b94f803c..000000000 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml +++ /dev/null @@ -1,80 +0,0 @@ ---- -- project: - name: logging-analytics-pomba-pomba-sdnc-context-builder - project-name: logging-analytics-pomba-pomba-sdnc-context-builder - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: logging-analytics/pomba/pomba-sdnc-context-builder - stream: - - 'master': - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -#- project: -# name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder -# project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder -# jobs: -# - '{project-name}-{stream}-docker-java-daily': -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# project: logging-analytics/pomba/pomba-sdnc-context-builder -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# -- project: - name: logging-analytics-pomba-pomba-sdnc-context-builder-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: 'H 11 * * *' - build-node: ubuntu1804-builder-4c-4g - project: logging-analytics/pomba/pomba-sdnc-context-builder - project-name: logging-analytics-pomba-pomba-sdnc-context-builder - branch: master - mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: logging-analytics-pomba-pomba-sdnc-context-builder-info - project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'logging-analytics/pomba/pomba-sdnc-context-builder' - branch: 'master' - -- project: - name: logging-analytics-pomba-pomba-sdnc-context-builder-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: logging-analytics/pomba/pomba-sdnc-context-builder - project-name: logging-analytics-pomba-pomba-sdnc-context-builder - branch: 'master' - mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 8b6c39180..7ef2950a9 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -81,7 +81,7 @@ stream: - 'master': branch: 'master' - build-node: centos7-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-settings: 'logging-analytics-settings' subproject: - 'pylog': 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/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 5bb4eeb12..dd43c952f 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -3,7 +3,7 @@ name: multicloud-k8s project-name: 'multicloud-k8s' path: 'src' - golangver: 'golang112' + golangver: 'golang114' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-golang' @@ -35,7 +35,7 @@ # name: multicloud-k8s-arm64 # project-name: 'multicloud-k8s-arm64' # path: 'src/k8splugin' -# golangver: 'golang112' +# golangver: 'golang114' # jobs: # - '{project-name}-{stream}-docker-golang-shell-daily': # script: diff --git a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml new file mode 100644 index 000000000..f6940517b --- /dev/null +++ b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: oom-platform-cert-manager-project-view + project-name: oom-platform-cert-manager + views: + - project-view + +- project: + name: oom-platform-cert-manager-info + project: oom/platform/cert-manager + project-name: oom-platform-cert-manager + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify 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 new file mode 100644 index 000000000..33d89f943 --- /dev/null +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml @@ -0,0 +1,15 @@ +# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed +- project: + name: oom-platform-cert-service-csit + jobs: + - "{project-name}-{stream}-verify-csit-{functionality}" + - "{project-name}-{stream}-csit-{functionality}" + project-name: "oom-platform-cert-service" + stream: + - "master": + branch: "master" + functionality: + - "certservice": + trigger_jobs: + - "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 new file mode 100644 index 000000000..5bcd5f327 --- /dev/null +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -0,0 +1,80 @@ +--- +- project: + name: oom-platform-cert-service-project-view + project-name: oom-platform-cert-service + views: + - project-view + +- project: + name: oom-platform-cert-service-info + project: oom/platform/cert-service + project-name: oom-platform-cert-service + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: oom-platform-cert-service + project-name: 'oom-platform-cert-service' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + project: 'oom/platform/cert-service' + mvn-settings: 'oom-platform-cert-service-settings' + files: '**' + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + jobs: + - '{project-name}-{stream}-verify-java': + mvn-goals: 'clean install' + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean deploy' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-goals: 'clean deploy -P docker' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' + +- project: + name: oom-platform-cert-service-sonar + subproject: 'oom-platform-cert-service' + path: 'certService' + java-version: openjdk11 + 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-docker-8c-8g + project: 'oom/platform/cert-service' + project-name: 'oom-platform-cert-service' + branch: 'master' + mvn-settings: 'oom-platform-cert-service-settings' + mvn-pom: 'certService/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: oom-platform-cert-service-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + 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/oom-platform-keycloak/oom-platform-keycloak.yaml b/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml new file mode 100644 index 000000000..308dd5be4 --- /dev/null +++ b/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: oom-platform-keycloak-project-view + project-name: oom-platform-keycloak + views: + - project-view + +- project: + name: oom-platform-keycloak-info + project: oom/platform/keycloak + project-name: oom-platform-keycloak + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index 5e96e1856..fc89d0226 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -23,3 +23,19 @@ build-node: centos7-builder-2c-1g project: oom/offline-installer branch: master + +- project: + name: offline-installer-linters + project: oom/offline-installer + project-name: offline-installer + python-version: python3 + jobs: + - integration-linters + subproject: + - 'py': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + stream: + - 'master': + branch: 'master' diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml deleted file mode 100644 index 5f4509b24..000000000 --- a/jjb/optf/optf-fgps.yaml +++ /dev/null @@ -1,121 +0,0 @@ ---- -- project: - name: optf-fgps-engine - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'engine': - path: 'engine' - pattern: 'engine/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' - -- project: - name: optf-fgps-valetapi - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'valetapi': - path: 'valetapi' - pattern: 'valetapi/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' - -- project: - name: optf-fgps-docker - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'valetapi': - path: 'valetapi' - pattern: 'valetapi/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-fgps-docker-image.sh' - build-node: queue-docker-4c-4g - - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-fgps-docker-image.sh' - build-node: queue-docker-4c-4g - -- project: - name: optf-fgps-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: 'optf/fgps' - project-name: 'optf-fgps' - branch: 'master' - mvn-settings: 'optf-fgps-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: optf-fgps-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: optf/fgps - project-name: 'optf-fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - -- project: - name: optf-fgps-info - project-name: optf-fgps - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: optf/fgps - branch: master diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 1aaec94f7..8d8321c88 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -39,36 +39,6 @@ archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g -- project: - name: policy-apex-pdp-jdk8 - project-name: 'policy-apex-pdp' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: "-P docker" - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - project: 'policy/apex-pdp' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-apex-pdp-settings' - java-version: openjdk8 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - - project: name: policy-apex-pdp-sonar jobs: diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 4d251a257..3c9579685 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -33,36 +33,6 @@ archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -- project: - name: policy-api-jdk8 - project-name: 'policy-api' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1804-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - project: 'policy/api' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-api-settings' - java-version: openjdk8 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - project: name: policy-api-sonar jobs: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 87d18ca56..8788f5da1 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -33,36 +33,6 @@ archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -- project: - name: policy-distribution-jdk8 - project-name: 'policy-distribution' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1804-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - project: 'policy/distribution' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-distribution-settings' - java-version: openjdk8 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - project: name: policy-distribution-sonar jobs: diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 61ac6feed..96e9c17fe 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-docker-base-common-elalto + name: policy-docker-base-common project-name: 'policy-docker' jobs: - '{project-name}-{stream}-verify-java' @@ -20,15 +20,15 @@ project: 'policy/docker' stream: - - 'elalto': - branch: 'elalto' + - 'master': + branch: 'master' mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g - project: - name: policy-docker-base-common + name: policy-docker-base-common-frankfurt project-name: 'policy-docker' jobs: - '{project-name}-{stream}-verify-java' @@ -77,8 +77,8 @@ project: 'policy/docker' stream: - - 'master': - branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index d122a504f..166f5ca09 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -34,36 +34,6 @@ build-node: ubuntu1804-docker-8c-8g -- project: - name: policy-drools-applications-jdk8 - project-name: 'policy-drools-applications' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: "-P docker" - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - project: 'policy/drools-applications' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-drools-applications-settings' - java-version: openjdk8 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - - project: name: policy-drools-applications-sonar jobs: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 23b00cc19..cc056ce93 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -33,36 +33,6 @@ archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g -- project: - name: policy-drools-pdp-jdk8 - project-name: 'policy-drools-pdp' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: "-P docker" - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - project: 'policy/drools-pdp' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-drools-pdp-settings' - java-version: openjdk8 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - - project: name: policy-drools-pdp-sonar jobs: diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index cb9e82f99..b1df14f7a 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -31,56 +31,6 @@ archive-artifacts: '' build-node: 'ubuntu1804-docker-8c-8g' -- project: - name: policy-engine-jdk8 - project-name: 'policy-engine' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: "-P docker" - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-Dmaven.test.skip=true' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - project: 'policy/engine' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-engine-settings' - java-version: openjdk8 - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' - -- project: - name: policy-engine-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: 'policy/engine' - project-name: 'policy-engine' - branch: 'frankfurt' - mvn-settings: 'policy-engine-settings' - java-version: openjdk11 - mvn-goals: 'clean install' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' - - project: name: policy-engine-clm jobs: diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 049e0aeb8..3bf16e61a 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -33,36 +33,6 @@ archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -- project: - name: policy-pap-jdk8 - project-name: 'policy-pap' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1804-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - project: 'policy/pap' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-pap-settings' - java-version: openjdk8 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - project: name: policy-pap-sonar jobs: diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 144eba17d..4607aec95 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -33,36 +33,6 @@ archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -- project: - name: policy-xacml-pdp-jdk8 - project-name: 'policy-xacml-pdp' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - docker-pom: 'pom.xml' - mvn-params: '-P docker' - build-node: ubuntu1804-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - project: 'policy/xacml-pdp' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-xacml-pdp-settings' - java-version: openjdk8 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - project: name: policy-xacml-pdp-sonar jobs: diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 0fdee27c1..312761027 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -21,6 +21,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 41847c34f..22117c78a 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -23,6 +23,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'sdc-dcae-d-dt-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index fa80c5370..fcd7d51a4 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -23,6 +23,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'sdc-dcae-d-fe-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 9bc31df3c..9c2d0576e 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -30,6 +30,8 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + - 'elalto': + branch: 'elalto' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 1c5166901..43234f873 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -55,6 +55,8 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + - 'elalto': + branch: 'elalto' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 8cba7aac3..428251ac8 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -26,6 +26,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' - 'frankfurt': branch: 'frankfurt' mvn-settings: 'sdnc-oam-settings' diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index 8feffb616..ca4d1a346 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -1,6 +1,7 @@ --- - project: name: so-csit + java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' @@ -9,6 +10,10 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' functionality: - 'integration-testing': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index af1be777c..87cf07fb3 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -15,8 +15,11 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'elalto': branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'so-libs-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 @@ -24,10 +27,12 @@ maven-deploy-properties: | deployAtEnd=true files: '**' + java-version: openjdk11 archive-artifacts: '' - project: name: so-libs-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -39,6 +44,7 @@ build-node: ubuntu1804-builder-4c-4g project: 'so/libs' project-name: 'so-libs' + java-version: openjdk11 branch: 'master' mvn-settings: 'so-libs-settings' mvn-goals: 'clean install' @@ -46,17 +52,20 @@ - project: name: so-libs-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: so/libs project-name: 'so-libs' + java-version: openjdk11 branch: 'master' mvn-settings: 'so-libs-settings' - project: name: so-libs-info project-name: so-libs + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index f408d95da..d21433429 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -2,6 +2,7 @@ - project: name: so-project-view project-name: so + java-version: openjdk11 views: - project-view @@ -27,8 +28,14 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' + - 'elalto': + branch: 'elalto' + - 'dynamicBPMN': + branch: 'Dynamic_BPMN' + java-version: openjdk11 mvn-settings: 'so-settings' files: '**' archive-artifacts: '' @@ -36,6 +43,7 @@ - project: name: so-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -55,6 +63,7 @@ - project: name: 'so-coverity' + java-version: openjdk11 jobs: - 'onap-gerrit-maven-coverity' cron: '@daily' @@ -83,6 +92,7 @@ - project: name: so-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -97,6 +107,7 @@ - project: name: so-info project-name: so + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml index e10356da4..b1b3f54c2 100644 --- a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml +++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml @@ -8,69 +8,38 @@ project: testsuite/pythonsdk-tests branch: master -# - project: -# name: testsuite-pythonsdk-tests-verify-python -# project-name: testsuite-pythonsdk-tests -# project: testsuite/pythonsdk-tests -# stream: -# - 'master': -# branch: 'master' -# - 'frankfurt': -# branch: 'frankfurt' -# mvn-settings: 'testsuite-pythonsdk-tests-settings' -# build-node: 'centos7-builder-4c-4g' -# jobs: -# - '{project-name}-{stream}-{subproject}-verify-python' -# -# - project: -# name: testsuite-pythonsdk-tests-verify-golang -# project-name: 'testsuite-pythonsdk-tests' -# project: 'testsuite/pythonsdk-tests' -# golangver: 'golang112' -# mvn-settings: 'testsuite-pythonsdk-tests-settings' -# archive-artifacts: '' -# jobs: -# - '{project-name}-{stream}-{subproject}-verify-golang' -# stream: -# - 'master': -# branch: 'master' -# - 'frankfurt': -# branch: 'frankfurt' -# -# - project: -# name: testsuite-pythonsdk-tests-linters -# project: 'testsuite/pythonsdk-tests' -# project-name: 'testsuite-pythonsdk-tests' -# python-version: python3 -# jobs: -# - testsuite-pythonsdk-tests-linters -# subproject: -# - 'yaml': -# tox-dir: '.' -# tox-envs: 'yaml' -# pattern: '**/*.yaml' -# - 'yml': -# tox-dir: '.' -# tox-envs: 'yaml' -# pattern: '**/*.yml' -# - 'json': -# tox-dir: '.' -# tox-envs: 'json' -# pattern: '**/*.json' -# - 'python': -# tox-dir: '.' -# tox-envs: 'py' -# pattern: '**/*.py' -# - 'rst': -# tox-dir: '.' -# tox-envs: 'rst' -# pattern: '**/*.rst' -# - 'md': -# tox-dir: '.' -# tox-envs: 'md' -# pattern: '**/*.md' -# stream: -# - 'master': -# branch: 'master' -# - 'frankfurt': -# branch: 'frankfurt' +- project: + name: testsuite-pythonsdk-tests-linters + project: 'testsuite/pythonsdk-tests' + project-name: 'testsuite-pythonsdk-tests' + python-version: python3 + jobs: + - integration-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + - 'python': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + - 'rst': + tox-dir: '.' + tox-envs: 'rst' + pattern: '**/*.rst' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + stream: + - 'master': + branch: 'master' diff --git a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml new file mode 100644 index 000000000..7a4ad4d6b --- /dev/null +++ b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: testsuite-robot-utils-project-view + project-name: testsuite-robot-utils + views: + - project-view + +- project: + name: testsuite-robot-utils-info + project: testsuite/robot-utils + project-name: testsuite-robot-utils + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/vfc/build-driver-ems-docker-image.sh b/jjb/vfc/build-driver-ems-docker-image.sh deleted file mode 100755 index 6804198b5..000000000 --- a/jjb/vfc/build-driver-ems-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./ems/microservice-standalone/src/main/assembly/docker/*.* - -./ems/microservice-standalone/src/main/assembly/docker/build_image.sh - diff --git a/jjb/vfc/build-driver-zte-sfc-docker-image.sh b/jjb/vfc/build-driver-zte-sfc-docker-image.sh deleted file mode 100755 index 8435ae139..000000000 --- a/jjb/vfc/build-driver-zte-sfc-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/*.* - -./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh - diff --git a/jjb/vfc/build-nfvo-catalog-docker-image.sh b/jjb/vfc/build-nfvo-catalog-docker-image.sh deleted file mode 100755 index d570d18a2..000000000 --- a/jjb/vfc/build-nfvo-catalog-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./docker/*.* - -./docker/build_image.sh - diff --git a/jjb/vfc/build-nfvo-multivimproxy-docker-image.sh b/jjb/vfc/build-nfvo-multivimproxy-docker-image.sh deleted file mode 100644 index d570d18a2..000000000 --- a/jjb/vfc/build-nfvo-multivimproxy-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./docker/*.* - -./docker/build_image.sh - diff --git a/jjb/vfc/build-nfvo-resmanagement-docker-image.sh b/jjb/vfc/build-nfvo-resmanagement-docker-image.sh deleted file mode 100755 index 539ea3e52..000000000 --- a/jjb/vfc/build-nfvo-resmanagement-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./ResmanagementService/docker/*.* - -./ResmanagementService/docker/build_image.sh - diff --git a/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh deleted file mode 100644 index 495220f26..000000000 --- a/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./activiti-extension/src/main/docker/*.sh -./activiti-extension/src/main/docker/activiti-docker-build_image.sh - diff --git a/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh deleted file mode 100644 index 3a27413df..000000000 --- a/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./wfenginemgrservice/src/main/docker/*.sh -./wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh - diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml deleted file mode 100644 index 0e46c4037..000000000 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ /dev/null @@ -1,71 +0,0 @@ ---- - -- project: - name: vfc-nfvo-catalog - project-name: 'vfc-nfvo-catalog' - project: 'vfc/nfvo/catalog' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-catalog-settings' - subproject: - - 'catalog': - path: '.' - pattern: '**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-catalog-docker-image.sh' - build-node: ubuntu1804-docker-8c-8g - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: centos7-redis-4c-4g - -- project: - name: vfc-nfvo-catalog-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: centos7-redis-4c-4g - project: 'vfc/nfvo/catalog' - project-name: 'vfc-nfvo-catalog' - branch: 'master' - mvn-settings: 'vfc-nfvo-catalog-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-catalog-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/catalog - project-name: 'vfc-nfvo-catalog' - build-node: centos7-redis-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-catalog-settings' - -- project: - name: vfc-nfvo-catalog-info - project-name: vfc-nfvo-catalog - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vfc/nfvo/catalog - branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml deleted file mode 100644 index 390228f7a..000000000 --- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vfc-nfvo-driver-ems-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-ems' - recipients: 'yangyanyj@chinamobile.com' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml deleted file mode 100644 index 85e9d6852..000000000 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- - -- project: - name: vfc-nfvo-driver-ems-java - project-name: 'vfc-nfvo-driver-ems' - project: 'vfc/nfvo/driver/ems' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-ems-settings' - subproject: - - 'drv-ems-boco': - pom: 'ems/pom.xml' - pattern: 'ems/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-driver-ems-docker-image.sh' - build-node: ubuntu1804-docker-8c-8g - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-driver-ems-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: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/driver/ems' - project-name: 'vfc-nfvo-driver-ems' - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-ems-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-driver-ems-java-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/driver/ems - project-name: 'vfc-nfvo-driver-ems' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-ems-settings' - -- project: - name: vfc-nfvo-driver-ems-info - project-name: vfc-nfvo-driver-ems - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vfc/nfvo/driver/ems - branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml deleted file mode 100644 index 1905012dc..000000000 --- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vfc-nfvo-driver-sfc-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-sfc' - recipients: 'yangyanyj@chinamobile.com' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml deleted file mode 100644 index 407a615e1..000000000 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ /dev/null @@ -1,72 +0,0 @@ ---- -- project: - name: vfc-nfvo-driver-sfc - project-name: 'vfc-nfvo-driver-sfc' - project: 'vfc/nfvo/driver/sfc' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-sfc-settings' - subproject: - - 'driver-sfc-zte': - pom: 'zte/sfc-driver/pom.xml' - pattern: 'zte/sfc-driver/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'zte/sfc-driver/pom.xml' - mvn-params: '-f zte/sfc-driver/pom.xml' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-driver-zte-sfc-docker-image.sh' - build-node: ubuntu1804-docker-8c-8g - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-driver-sfc-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' - mvn-params: '-f zte/sfc-driver/pom.xml' - build-node: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/driver/sfc' - project-name: 'vfc-nfvo-driver-sfc' - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-sfc-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-driver-sfc-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/driver/sfc - project-name: 'vfc-nfvo-driver-sfc' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-sfc-settings' - -- project: - name: vfc-nfvo-driver-sfc-info - project-name: vfc-nfvo-driver-sfc - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vfc/nfvo/driver/sfc - branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index f8784524a..1db7b6777 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -2,6 +2,7 @@ - project: name: vfc-nfvo-driver-svnfm-huawei project-name: 'vfc-nfvo-driver-svnfm-huawei' + java-version: openjdk11 project: 'vfc/nfvo/driver/vnfm/svnfm' stream: - 'master': @@ -28,6 +29,7 @@ - project: name: vfc-nfvo-driver-svnfm-huawei-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -47,6 +49,7 @@ - project: name: vfc-nfvo-driver-svnfm-huawei-clm + java-version: openjdk11 jobs: - gerrit-maven-clm: mvn-params: '-f huawei/pom.xml' @@ -60,6 +63,7 @@ - project: name: vfc-nfvo-driver-svnfm-huawei-info project-name: vfc-nfvo-driver-svnfm-huawei + java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml deleted file mode 100644 index 0f56d0c7c..000000000 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- - -- project: - name: vfc-nfvo-driver-vnfm-gvnfm-juju - project-name: 'vfc-nfvo-driver-vnfm-gvnfm' - project: 'vfc/nfvo/driver/vnfm/gvnfm' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' - subproject: - - 'gvnfm-juju': - pom: 'juju/juju-vnfmadapter/pom.xml' - pattern: 'juju/juju-vnfmadapter/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-driver-vnfm-gvnfm-juju-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: ubuntu1804-builder-4c-4g - mvn-params: '-f juju/juju-vnfmadapter/pom.xml' - project: 'vfc/nfvo/driver/vnfm/gvnfm' - project-name: 'vfc-nfvo-driver-vnfm-gvnfm-juju' - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml deleted file mode 100644 index 88607ebf5..000000000 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ /dev/null @@ -1,98 +0,0 @@ ---- -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokiav2 - project: 'vfc/nfvo/driver/vnfm/svnfm' - project-name: 'vfc-nfvo-driver-svnfm-nokiav2' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - subproject: - - 'drv-vnfm-nokiav2': - pom: 'nokiav2/pom.xml' - pattern: 'nokiav2/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'nokiav2/pom.xml' - mvn-params: '-f nokiav2/pom.xml' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: 'nokiav2/**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker - project: 'vfc/nfvo/driver/vnfm/svnfm' - project-name: 'vfc-nfvo-driver-svnfm-nokiav2' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - subproject: - - 'docker-vnfm-nokiav2': - pom: 'nokiav2/pom.xml' - pattern: 'nokiav2/**' - jobs: - - '{project-name}-{subproject}-{stream}-verify-docker-cascade-trigger': - docker_build_args: '--file Dockerfile.verify --build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots' - docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment' - parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-verify-java' - - '{project-name}-{subproject}-{stream}-merge-docker-cascade-trigger': - docker_build_args: '--build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots' - docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment' - parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-merge-java' - - '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger': - docker_build_args: '--build-arg MODE= --build-arg REPO=staging' - docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment' - docker_registry: '$DOCKER_REGISTRY:10003' - parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-release-version-java-daily' -#Since the release is moved manually from the staging repo to the release repo this job can not -#be triggered in a cascade way - - '{project-name}-{subproject}-{stream}-release-version-docker-no-sonar': - docker_build_args: '--build-arg MODE= --build-arg REPO=releases' - docker_name: 'onap/vfc/nfvo/svnfm/nokiav2' - docker_root: '$WORKSPACE/nokiav2/deployment' - docker_registry: '$DOCKER_REGISTRY:10003' - files: 'nokiav2/**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar - project: 'vfc/nfvo/driver/vnfm/svnfm' - project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2' - cron: '@daily' - branch: 'master' - mvn-params: '-f nokiav2/pom.xml' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - 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" - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f nokiav2/pom.xml' - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/driver/vnfm/svnfm - project-name: 'vfc-nfvo-driver-svnfm-nokiav2' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml deleted file mode 100644 index 6a8377f1b..000000000 --- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vfc-nfvo-multivimproxy-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-multivimproxy' - recipients: 'yangyanyj@chinamobile.com' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml deleted file mode 100644 index 16866a8fa..000000000 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ /dev/null @@ -1,63 +0,0 @@ ---- -- project: - name: vfc-nfvo-multivimproxy - project: 'vfc/nfvo/multivimproxy' - project-name: 'vfc-nfvo-multivimproxy' - mvn-settings: 'vfc-nfvo-multivimproxy-settings' - stream: - - 'master': - branch: 'master' - build-node: ubuntu1804-builder-4c-4g - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh' - build-node: ubuntu1804-docker-8c-8g - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - -- project: - name: vfc-nfvo-multivimproxy-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: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/multivimproxy' - project-name: 'vfc-nfvo-multivimproxy' - branch: 'master' - mvn-settings: 'vfc-nfvo-multivimproxy-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-multivimproxy-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/multivimproxy - project-name: 'vfc-nfvo-multivimproxy' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-multivimproxy-settings' - -- project: - name: vfc-nfvo-multivimproxy-info - project-name: vfc-nfvo-multivimproxy - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vfc/nfvo/multivimproxy - branch: master diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml deleted file mode 100644 index 1534fd5ea..000000000 --- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vfc-nfvo-resmanagement-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-resmanagement' - recipients: 'yangyanyj@chinamobile.com' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml deleted file mode 100644 index b162ab848..000000000 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ /dev/null @@ -1,63 +0,0 @@ ---- -- project: - name: vfc-nfvo-resmanagement - project: 'vfc/nfvo/resmanagement' - project-name: 'vfc-nfvo-resmanagement' - mvn-settings: 'vfc-nfvo-resmanagement-settings' - stream: - - 'master': - branch: 'master' - build-node: ubuntu1804-builder-4c-4g - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh' - build-node: ubuntu1804-docker-8c-8g - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - -- project: - name: vfc-nfvo-resmanagement-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: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/resmanagement' - project-name: 'vfc-nfvo-resmanagement' - branch: 'master' - mvn-settings: 'vfc-nfvo-resmanagement-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-resmanagement-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/resmanagement - project-name: 'vfc-nfvo-resmanagement' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-resmanagement-settings' - -- project: - name: vfc-nfvo-resmanagement-info - project-name: vfc-nfvo-resmanagement - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vfc/nfvo/resmanagement - branch: master diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml deleted file mode 100644 index ca51fc3c3..000000000 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ /dev/null @@ -1,139 +0,0 @@ ---- -- project: - name: vfc-nfvo-wfengine - project-name: 'vfc-nfvo-wfengine' - project: 'vfc/nfvo/wfengine' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - subproject: - - 'engine-mgr-service': - pom: 'wfenginemgrservice/pom.xml' - pattern: 'wfenginemgrservice/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' - - 'engine-activiti-extension': - pom: 'activiti-extension/pom.xml' - pattern: 'activiti-extension/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - mvn-goals: 'clean' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-wfengine-engine-mgr-service-stage - project-name: 'vfc-nfvo-wfengine-engine-mgr-service' - project: 'vfc/nfvo/wfengine' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - subproject: - - 'engine-mgr-service': - pom: 'wfenginemgrservice/pom.xml' - pattern: 'wfenginemgrservice/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' - jobs: - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'wfenginemgrservice/pom.xml' - mvn-params: '-f wfenginemgrservice/pom.xml' - - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-wfengine-engine-activiti-extension-stage - project-name: 'vfc-nfvo-wfengine-engine-activiti-extension' - project: 'vfc/nfvo/wfengine' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - subproject: - - 'engine-activiti-extension': - pom: 'activiti-extension/pom.xml' - pattern: 'activiti-extension/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' - jobs: - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'activiti-extension/pom.xml' - mvn-params: '-f activiti-extension/pom.xml' - - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-wfengine-wfenginemgrservice-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" - mvn-params: '-f wfenginemgrservice/pom.xml' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/wfengine' - project-name: 'vfc-nfvo-wfengine-wfenginemgrservice' - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -- project: - name: vfc-nfvo-wfengine-activiti-extension-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" - mvn-params: '-f activiti-extension/pom.xml' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/wfengine' - project-name: 'vfc-nfvo-wfengine-activiti-extension' - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-wfengine-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/wfengine - project-name: 'vfc-nfvo-wfengine' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - -- project: - name: vfc-nfvo-wfengine-info - project-name: vfc-nfvo-wfengine - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vfc/nfvo/wfengine - branch: master diff --git a/packer/common-packer b/packer/common-packer index da5d5cf92..2b8bd41cb 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit da5d5cf92fafcdc0f31a76d2955e8ac9c327c100 +Subproject commit 2b8bd41cbf7e3d5faaa90fba9da1a07fdf967ea9 diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index 346098144..077c52f65 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -52,6 +52,15 @@ become: true when: ansible_distribution == 'Ubuntu' + - name: Install Python 3.8 + apt: + name: + - python3.8 + - python3.8-dev + - python3.8-tk + become: true + when: ansible_distribution == 'Ubuntu' + - name: Install libssl1.0-dev dep apt: name: libssl1.0-dev diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 0948cd004..9f590ea48 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -106,6 +106,15 @@ become: true when: ansible_distribution == 'Ubuntu' + - name: Install Python 3.8 + apt: + name: + - python3.8 + - python3.8-dev + - python3.8-tk + become: true + when: ansible_distribution == 'Ubuntu' + - name: Install nodejs-dev libssl1.0-dev dep apt: name: