diff options
53 files changed, 483 insertions, 290 deletions
diff --git a/INFO.yaml b/INFO.yaml new file mode 100644 index 000000000..6c8cbeca7 --- /dev/null +++ b/INFO.yaml @@ -0,0 +1,60 @@ +--- +project: 'ci-management' +project_creation_date: '2017-01-24' +lifecycle_state: 'Incubation' +project_category: '' +project_lead: &onap_releng_ptl + name: 'Jessica Wagantall' + email: 'jwagantall@linuxfoundation.org' + id: 'jwagantall' + company: 'LF' + timezone: 'America/Los_Angeles' +primary_contact: *onap_releng_ptl +issue_tracking: + type: 'jira' + url: 'https://jira.onap.org/projects/CIMAN' + key: 'CIMAN' +mailing_list: + type: 'groups.io' + url: 'lists.onap.org' + tag: '<[sub-project_name]>' +realtime_discussion: '' +meetings: + - type: 'zoom' + agenda: 'n/a' + url: 'n/a' + server: 'n/a' + channel: 'n/a' + repeats: 'n/a' + time: 'n/a' +repositories: + - ci-management +committers: + - <<: *onap_releng_ptl + - name: 'Bengt Thuree' + email: 'bthuree@linuxfoundation.org' + company: 'LF' + id: 'bthuree' + timezone: 'Australia/Melbourne' + - name: 'Andrew Grimberg' + email: 'agrimberg@linuxfoundation.org' + company: 'LF' + id: 'agrimberg' + timezone: 'America/Los_Angeles' + - name: 'Eric Ball' + email: 'eball@linuxfoundation.org' + company: 'LF' + id: 'eball' + timezone: 'America/Los_Angeles' + - name: 'Aric Gardner' + email: 'agardner@linuxfoundation.org' + company: 'LF' + id: 'agardner' + timezone: 'America/New_York' + - name: 'Anil Belur' + email: 'abelur@linuxfoundation.org' + company: 'LF' + id: 'abelur' + timezone: 'Australia/Brisbane' +tsc: + approval: 'https://lists.onap.org/pipermail/onap-tsc' diff --git a/global-jjb b/global-jjb -Subproject 64faafae2362d36e4d5c3e8d5fe6579b9d09cf5 +Subproject 33e49c57ff646e8bad3d033ee770df88d8051f7 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 de51c46fd..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 - 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 0743989b7..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 - 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 3d474c9bd..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 - 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/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index 3c83f0a14..9f7a17267 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -17,7 +17,7 @@ RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org RELEASE_USERNAME=onap-release S3_BUCKET= SIGUL_BRIDGE_IP=10.30.104.3 -SIGUL_KEY=onap-release-2018 +SIGUL_KEY=onap-release-2020 SILO=production SONAR_URL=https://sonar.onap.org MASTER_RTD_PROJECT=doc diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index 75ce5938b..72470945a 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -17,7 +17,7 @@ RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org RELEASE_USERNAME=onap-release S3_BUCKET= SIGUL_BRIDGE_IP=10.30.104.3 -SIGUL_KEY=onap-test +SIGUL_KEY=onap-sandbox SILO=sandbox SONAR_URL=https://sonar.onap.org MASTER_RTD_PROJECT=doc-test diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index c6c3f56b1..20a246627 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -21,7 +21,7 @@ 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-version: "mvn36" cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -40,7 +40,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -62,7 +62,7 @@ mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-apps-clm @@ -77,7 +77,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-apps-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g #- project: diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 71ffd5488..fd25f149e 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -16,7 +16,7 @@ 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-version: "mvn36" maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': @@ -28,7 +28,7 @@ mvn-settings: 'ccsdk-oran-settings' files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" java-version: openjdk11 docker-pom: 'pom.xml' mvn-profile: docker @@ -43,3 +43,23 @@ build-node: centos7-builder-2c-1g jobs: - gerrit-info-yaml-verify + +- project: + name: ccsdk-oran-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-docker-8c-8g + project: 'ccsdk/oran' + project-name: 'ccsdk-oran' + branch: 'master' + mvn-settings: 'ccsdk-oran-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn36" + java-version: openjdk11 diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index beb0c1713..4afe8efcc 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -16,7 +16,7 @@ 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-version: "mvn36" maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': @@ -38,7 +38,8 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" + java-version: openjdk11 build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -60,7 +61,8 @@ mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" + java-version: openjdk11 - project: name: ccsdk-cds-clm @@ -75,7 +77,8 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-cds-settings' - maven-version: "mvn35" + maven-version: "mvn36" + java-version: openjdk11 build-node: ubuntu1804-builder-4c-4g @@ -98,3 +101,5 @@ mvn-clean-install: true project: ccsdk/cds branch: master + maven-version: "mvn36" + java-version: openjdk11 diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 353ee2d67..317c55101 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -16,7 +16,7 @@ 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-version: "mvn36" maven-versions-plugin: true cron: '@daily' @@ -32,12 +32,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' + java-version: openjdk11 build-node: ubuntu1804-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-dashboard-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -61,6 +63,7 @@ nexus-iq-namespace: 'onap-' project: 'ccsdk/dashboard' project-name: 'ccsdk-dashboard' + java-version: openjdk11 stream: - 'master': branch: 'master' @@ -86,3 +89,4 @@ mvn-clean-install: true project: ccsdk/dashboard branch: master + java-version: openjdk11 diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 47e616bf6..760e127a9 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -16,7 +16,7 @@ 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-version: "mvn36" maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': @@ -32,7 +32,7 @@ mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 17dd0b477..06e4a5597 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -27,7 +27,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' @@ -50,7 +50,7 @@ mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-features-clm @@ -66,7 +66,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-features-settings' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 0d3a3ee2c..7b716f729 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -29,7 +29,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-parent-clm @@ -44,7 +44,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-parent-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index ad92332ef..012df50af 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -30,7 +30,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -52,7 +52,7 @@ mvn-settings: 'ccsdk-sli-adaptors-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-sli-adaptors-clm @@ -67,7 +67,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-sli-adaptors-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 0fc6d6c94..e6169e975 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -30,7 +30,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -52,7 +52,7 @@ mvn-settings: 'ccsdk-sli-core-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-sli-core-clm @@ -67,7 +67,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-sli-core-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index d130cb121..45761e5a9 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -30,7 +30,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -52,7 +52,7 @@ mvn-settings: 'ccsdk-sli-northbound-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-sli-northbound-clm @@ -67,7 +67,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-sli-northbound-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 4f99ad87d..a6d1cd4fc 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -30,7 +30,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -52,7 +52,7 @@ mvn-settings: 'ccsdk-sli-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-sli-plugins-clm @@ -67,7 +67,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-sli-plugins-settings' - maven-version: "mvn35" + maven-version: "mvn36" - project: 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..74d02d674 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -6,6 +6,15 @@ - project-view - project: + name: ci-management-info + project-name: ci-management + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: ci-management + branch: master + +- project: name: ci-management-jobs jobs: - '{project-name}-ci-jobs' @@ -35,3 +44,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.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml deleted file mode 100644 index e0e4c059f..000000000 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- project: - name: dcaegen2-analytics-tca - - # job template iterators - project-name: 'dcaegen2-analytics-tca' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - # apply to all jobs - project: 'dcaegen2/analytics/tca' - mvn-settings: 'dcaegen2-analytics-tca-settings' - files: '**' - maven-deploy-properties: | - deployAtEnd=true - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - jobs: - - '{project-name}-{stream}-verify-java': - mvn-params: '-DskipTests=true' - - '{project-name}-{stream}-merge-java' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-params: '-DskipTests=true' - -- project: - name: dcaegen2-analytics-tca-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'dcaegen2/analytics/tca' - project-name: 'dcaegen2-analytics-tca' - branch: 'master' - mvn-settings: 'dcaegen2-analytics-tca-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-analytics-tca-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'dcaegen2/analytics/tca' - project-name: 'dcaegen2-analytics-tca' - branch: 'master' - build-node: ubuntu1804-builder-4c-4g - mvn-settings: 'dcaegen2-analytics-tca-settings' - -- project: - name: dcaegen2-analytics-tca-info - project-name: dcaegen2-analytics-tca - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dcaegen2/analytics/tca - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 889623774..4586ab144 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -55,6 +55,7 @@ - project: name: dcaegen2-collectors-ves-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/dcaegen2/dcaegen2-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-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml new file mode 100644 index 000000000..fc2e3df71 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: dcaegen2-platform-mod2-assembly + project-name: dcaegen2-platform-mod2 + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - assembly: + pom: 'mod/assembly/pom.xml' + pattern: 'mod/assembly/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml new file mode 100644 index 000000000..c3670f631 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml @@ -0,0 +1,55 @@ +--- +- project: + name: dcaegen2-platform-mod2-auth-service + project-name: dcaegen2-platform-mod2 + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - auth-service: + pom: 'mod/auth-service/pom.xml' + pattern: 'mod/auth-service/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: dcaegen2-platform-mod2-auth-service-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/platform' + project-name: 'dcaegen2-platform-mod2-auth-service' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/auth-service/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-mod2-auth-service-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1804-docker-8c-8g + project: 'dcaegen2/platform' + project-name: dcaegen2-platform-mod2-auth-service-clm + mvn-params: '-f mod/auth-service/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml new file mode 100644 index 000000000..1d7c05778 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml @@ -0,0 +1,55 @@ +--- +- project: + name: dcaegen2-platform-mod2-catalog-service + project-name: dcaegen2-platform-mod2 + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - catalog-service: + pom: 'mod/catalog-service/pom.xml' + pattern: 'mod/catalog-service/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: dcaegen2-platform-mod2-catalog-service-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/platform' + project-name: 'dcaegen2-platform-mod2-catalog-service' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/catalog-service/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-mod2-catalog-service-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1804-docker-8c-8g + project: 'dcaegen2/platform' + project-name: dcaegen2-platform-mod2-catalog-service-clm + mvn-params: '-f mod/catalog-service/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml new file mode 100644 index 000000000..8795a8713 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml @@ -0,0 +1,55 @@ +--- +- project: + name: dcaegen2-platform-mod2-ui + project-name: dcaegen2-platform-mod2 + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - ui: + pom: 'mod/ui/pom.xml' + pattern: 'mod/ui/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: dcaegen2-platform-mod2-ui-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/platform' + project-name: 'dcaegen2-platform-mod2-ui' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/ui/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-mod2-ui-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1804-docker-8c-8g + project: 'dcaegen2/platform' + project-name: dcaegen2-platform-mod2-ui-clm + mvn-params: '-f mod/ui/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 468b07a86..b634404df 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,39 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + mvn-settings: 'dcaegen2-services-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: dcaegen2-services-datalake-handler-des-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler-des' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'components/datalake-handler/pom.xml' + mvn-params: '-f components/datalake-handler/pom.xml' + version-properties-file: 'components/datalake-handler/version.properties' + pattern: 'components/datalake-handler/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'components/datalake-handler/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-settings' @@ -86,6 +121,7 @@ - project: name: dcaegen2-services-datalake-handler-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true 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..34b4a63ce --- /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 reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index b315bc443..410a02503 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -53,3 +53,27 @@ jobs: - gerrit-docker-verify - gerrit-docker-merge + +- project: + name: integration-docker-aai-simulator + project-name: 'integration' + jobs: + - integration-docker-merge + - integration-docker-verify + project: 'integration' + stream: + - 'master': + branch: 'master' + subproject: + - 'aai-simulator': + pom: 'test/mocks/aai-simulator/pom.xml' + pattern: 'test/mocks/aai-simulator/**' + mvn-goals: 'mvn clean install -Dcheckstyle.skip' + post-docker-verify-script: | + #!/bin/bash + set -ex # Fail build if any setup step fails + cd $WORKSPACE/test/mocks/aai-simulator + tox + mvn-settings: 'integration-settings' + files: '**' + archive-artifacts: '' 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/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 2065813c5..5cbce4e84 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -89,26 +89,6 @@ 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' @@ -123,6 +103,11 @@ - 'master': branch: 'master' files: '' + - 'frankfurt': + branch: 'frankfurt' + files: '' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g + cron: '@daily' + container-tag-method: stream diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 323311824..d28e62eb0 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 mvn-settings: 'multicloud-framework-settings' subproject: - 'multivimbroker': @@ -102,6 +103,7 @@ project: 'multicloud/framework' project-name: 'multicloud-framework-artifactbroker' branch: 'master' + java-version: openjdk11 mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' mvn-goals: 'clean install' @@ -115,5 +117,6 @@ project: multicloud/framework project-name: 'multicloud-framework-artifactbroker' branch: 'master' + java-version: openjdk11 mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml index 5cf656acf..a3a0d6017 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml @@ -11,5 +11,8 @@ functionality: - "certservice": trigger_jobs: - - "{project-name}-{stream}-merge-java" + - "oom-platform-cert-service-{stream}-merge-java" + - "truststoremerger": + 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 index 99a63873b..5bcd5f327 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -69,10 +69,12 @@ - project: name: oom-platform-cert-service-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: 'oom/platform/cert-service' + project: oom/platform/cert-service project-name: 'oom-platform-cert-service' branch: 'master' + build-node: ubuntu1804-docker-8c-8g mvn-settings: 'oom-platform-cert-service-settings' diff --git a/jjb/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/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 862447a95..43234f873 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -1,11 +1,5 @@ --- - project: - name: sdc-master-project-view - project-name: sdc-master - views: - - project-view - -- project: name: sdc-sdc-docker-project-view project-name: sdc-sdc-docker views: @@ -24,6 +18,12 @@ - project-view - project: + name: sdc-project-view + project-name: sdc + views: + - project-view + +- project: name: sdc project-name: 'sdc' jobs: diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index c2aae6fad..a515ee934 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -2,7 +2,6 @@ - project: name: so-libs project-name: 'so-libs' - java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -28,7 +27,6 @@ maven-deploy-properties: | deployAtEnd=true files: '**' - java-version: openjdk11 archive-artifacts: '' - project: @@ -67,7 +65,6 @@ name: so-libs-info project-name: so-libs java-version: openjdk11 - 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 11b4a1f1e..d21433429 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -9,7 +9,6 @@ - project: name: so project-name: 'so' - java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -29,14 +28,15 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' - 'elalto': branch: 'elalto' - 'dynamicBPMN': branch: 'Dynamic_BPMN' + java-version: openjdk11 mvn-settings: 'so-settings' - java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index d43564192..ffc6c064b 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -17,45 +17,24 @@ container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# build-node: ubuntu1804-docker-8c-8g project: 'vnfsdk/refrepo' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'vnfsdk-refrepo-settings' files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -#- project: -# name: vnfsdk-refrepo-arm64 -# project-name: 'vnfsdk-refrepo-arm64' -# jobs: -# - '{project-name}-{stream}-aai-docker-java-daily': -# pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' -# mvn-goals: 'docker:build' -# docker-image-name: 'onap/vnfsdk/refrepo' -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# project: 'vnfsdk/refrepo' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'vnfsdk-refrepo-settings' -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# - project: name: vnfsdk-refrepo-sonar jobs: - gerrit-maven-sonar + java-version: openjdk11 sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -81,6 +60,7 @@ - project: name: vnfsdk-refrepo-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 3d5a602a1..d7f4b2789 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -13,8 +13,12 @@ build-node: centos7-docker-8c-8g project: 'vnfsdk/validation' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'vnfsdk-validation-settings' files: '**' archive-artifacts: '' @@ -24,6 +28,7 @@ name: vnfsdk-validation-sonar jobs: - gerrit-maven-sonar + java-version: openjdk11 sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -49,6 +54,7 @@ - project: name: vnfsdk-validation-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' |