diff options
Diffstat (limited to 'jjb')
148 files changed, 1569 insertions, 2404 deletions
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 64b3bc3b9..d8417badf 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -6,6 +6,8 @@ jobs: - '{project-name}-{stream}-verify-java' - '{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-docker-8c-8g 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 @@ -31,6 +31,36 @@ 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 jobs: @@ -38,4 +68,3 @@ build-node: centos7-builder-2c-1g project: aai/graphgraph branch: master - diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index 9b92ea138..4ea6eb843 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'aai-oom-settings' files: '**' diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index c6c3f56b1..088325835 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -21,7 +21,6 @@ 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" cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -30,8 +29,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-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 @@ -40,7 +41,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -59,10 +59,11 @@ project: 'ccsdk/apps' project-name: 'ccsdk-apps' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: name: ccsdk-apps-clm @@ -74,10 +75,11 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g #- project: @@ -111,6 +113,8 @@ project-name: ccsdk-apps jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index fcb12894f..59216ae99 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'ccsdk' + disabled: true recipients: 'dtimoney@att.com' stream: - 'master': @@ -14,3 +15,17 @@ trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' + +- project: + name: ccsdk-oran-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'ccsdk-oran' + recipients: 'bjorn.magnusson@est.tech maxime.bonneau@est.tech' + stream: 'master' + functionality: + - 'polmansuite': + trigger_jobs: '{project-name}-maven-docker-stage-master' + robot-options: '' + branch: 'master' diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml new file mode 100644 index 000000000..aee9a76f2 --- /dev/null +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -0,0 +1,81 @@ +--- +- 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 + mvn-opts: '-Ddocker.skip=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-versions-plugin: true + cron: '@daily' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'ccsdk/oran' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-oran-settings' + files: '**' + archive-artifacts: '' + 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 + +- 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' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-oran-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-oran-rtd + project-name: 'ccsdk-oran' + jobs: + - '{project-name}-rtd-jobs' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + project: 'ccsdk/oran' + project-pattern: ccsdk/oran + rtd-build-url: https://readthedocs.org/api/v2/webhook/onap-ccsdk-oran/133602/ + rtd-token: 7346b9ecd6195ab86db1fcadd29662512edc86e1 diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index beb0c1713..5882f0afc 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -3,20 +3,20 @@ name: ccsdk-cds project-name: 'ccsdk-cds' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + mvn-params: '-Ddocker.skip.push=true -P docker' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Ddocker.skip.push=true -P docker' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true - maven-versions-plugin: true + mvn-params: '-Dmaven.test.skip=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': @@ -30,6 +30,10 @@ branch: 'elalto' - 'frankfurt': branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-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 @@ -38,8 +42,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu1804-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -57,10 +60,11 @@ project: 'ccsdk/cds' project-name: 'ccsdk-cds' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: name: ccsdk-cds-clm @@ -72,13 +76,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - - project: name: ccsdk-cds-info project-name: ccsdk-cds @@ -93,6 +97,8 @@ project-name: ccsdk-cds jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 353ee2d67..6447d1afc 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -16,7 +16,6 @@ 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' @@ -24,6 +23,8 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-dashboard-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 @@ -50,6 +51,8 @@ project: 'ccsdk/dashboard' project-name: 'ccsdk-dashboard' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-dashboard-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -64,6 +67,8 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-dashboard-settings' build-node: centos7-redis-4c-4g @@ -81,6 +86,8 @@ project-name: ccsdk-dashboard jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-dashboard-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index be94c4f07..a64443527 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -16,7 +16,6 @@ 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': @@ -25,12 +24,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' - maven-version: "mvn35" docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1804-docker-8c-8g @@ -65,8 +65,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' build-node: ubuntu1804-docker-8c-8g @@ -87,6 +89,8 @@ jobs: - gerrit-whitesource-scan: java-opts: '-Xmx2048m' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 17dd0b477..eb9e8307d 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -17,8 +17,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-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 @@ -27,7 +29,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' @@ -47,10 +48,11 @@ project: 'ccsdk/features' project-name: 'ccsdk-features' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - maven-version: "mvn35" - project: name: ccsdk-features-clm @@ -62,11 +64,12 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - project: @@ -84,6 +87,8 @@ project-name: ccsdk-features jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 0d3a3ee2c..24cf739ef 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -19,8 +19,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-parent-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 @@ -29,7 +31,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" - project: name: ccsdk-parent-clm @@ -41,13 +42,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-parent-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - - project: name: ccsdk-parent-info project-name: ccsdk-parent @@ -62,6 +63,8 @@ project-name: ccsdk-parent jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-parent-settings' wss-product-name: ccsdk mvn-clean-install: true 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/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index ad92332ef..bd553e112 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -10,9 +10,6 @@ build-node: centos7-builder-4c-4g sign-artifacts: true cron: '' - - '{project-name}-maven-javadoc-jobs': - mvn-site-id: ecomp-site - javadoc-path: org.onap.$PROJECT/$STREAM - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -20,8 +17,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-adaptors-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 @@ -30,7 +29,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -49,10 +47,11 @@ project: 'ccsdk/sli/adaptors' project-name: 'ccsdk-sli-adaptors' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-adaptors-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: name: ccsdk-sli-adaptors-clm @@ -64,13 +63,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-adaptors-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - - project: name: ccsdk-sli-adaptors-info project-name: ccsdk-sli-adaptors @@ -86,6 +85,8 @@ project-name: ccsdk-sli-adaptors jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-adaptors-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 0fc6d6c94..658a92c3b 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -10,9 +10,6 @@ build-node: centos7-builder-4c-4g sign-artifacts: true cron: '' - - '{project-name}-maven-javadoc-jobs': - mvn-site-id: ecomp-site - javadoc-path: org.onap.$PROJECT/$STREAM - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -20,8 +17,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-core-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 @@ -30,7 +29,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -49,10 +47,11 @@ project: 'ccsdk/sli/core' project-name: 'ccsdk-sli-core' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-core-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: name: ccsdk-sli-core-clm @@ -64,13 +63,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-core-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - - project: name: ccsdk-sli-core-info project-name: ccsdk-sli-core @@ -85,6 +84,8 @@ project-name: ccsdk-sli-core jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-core-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index d130cb121..a66c774ed 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -9,9 +9,6 @@ - gerrit-maven-stage: build-node: centos7-builder-4c-4g cron: '' - - '{project-name}-maven-javadoc-jobs': - mvn-site-id: ecomp-site - javadoc-path: org.onap.$PROJECT/$STREAM - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -20,8 +17,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-northbound-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 @@ -30,7 +29,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -49,10 +47,11 @@ project: 'ccsdk/sli/northbound' project-name: 'ccsdk-sli-northbound' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-northbound-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: name: ccsdk-sli-northbound-clm @@ -64,13 +63,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-northbound-settings' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g - - project: name: ccsdk-sli-northbound-info project-name: ccsdk-sli-northbound @@ -85,6 +84,8 @@ project-name: ccsdk-sli-northbound jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-northbound-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 4f99ad87d..4433bb374 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -10,9 +10,6 @@ build-node: centos7-builder-4c-4g sign-artifacts: true cron: '' - - '{project-name}-maven-javadoc-jobs': - mvn-site-id: ecomp-site - javadoc-path: org.onap.$PROJECT/$STREAM - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -20,8 +17,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-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 @@ -30,7 +29,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -49,10 +47,11 @@ project: 'ccsdk/sli/plugins' project-name: 'ccsdk-sli-plugins' branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" - project: name: ccsdk-sli-plugins-clm @@ -64,11 +63,11 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-plugins-settings' - maven-version: "mvn35" - - project: name: ccsdk-sli-plugins-info @@ -84,6 +83,8 @@ project-name: ccsdk-sli-plugins jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-plugins-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 3486a30d5..52ab57ddc 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -17,6 +17,8 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-utils-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -38,9 +40,10 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-utils-settings' - - project: name: ccsdk-utils-info project-name: ccsdk-utils @@ -55,6 +58,8 @@ project-name: ccsdk-utils jobs: - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' mvn-settings: 'ccsdk-utils-settings' wss-product-name: ccsdk mvn-clean-install: true 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..01df83217 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 @@ -35,6 +36,8 @@ branch: 'frankfurt' - 'elalto': branch: 'elalto' + - 'tosca-poc': + branch: 'tosca-poc' mvn-settings: 'clamp-settings' java-version: openjdk11 files: '**' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 4d1f3de26..89b94601d 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -31,8 +31,12 @@ build-node: ubuntu1804-docker-8c-8g project: 'cli' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'cli-settings' files: '**' archive-artifacts: '' 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..f6859a3b4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -23,8 +23,10 @@ # build docker image - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - gerrit-release-verify - - gerrit-release-merge + - gerrit-release-verify: + build-node: centos7-docker-8c-8g + - gerrit-release-merge: + build-node: centos7-docker-8c-8g stream: - master: branch: master @@ -33,19 +35,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-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index de506f82d..0f061b9de 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -22,6 +22,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-platform-settings' @@ -30,3 +31,23 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: dcaegen2-platform-mod-bpgenerator-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-mod-bpgenerator' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/bpgenerator/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' 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..66378f8a1 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml @@ -0,0 +1,25 @@ +--- +- 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: 'mod2/assembly/pom.xml' + pattern: 'mod2/assembly/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + 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..be620998f --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml @@ -0,0 +1,58 @@ +--- +- 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: 'mod2/auth-service/pom.xml' + pattern: 'mod2/auth-service/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + 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 mod2/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 mod2/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..274d7e595 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml @@ -0,0 +1,58 @@ +--- +- 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: 'mod2/catalog-service/pom.xml' + pattern: 'mod2/catalog-service/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + 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 mod2/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 mod2/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..3d8ea65fd --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml @@ -0,0 +1,58 @@ +--- +- 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: 'mod2/ui/pom.xml' + pattern: 'mod2/ui/**' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-settings: dcaegen2-platform-settings + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + 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 mod2/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 mod2/ui/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 07722a5e3..ea801033c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -2,27 +2,27 @@ - project: name: dcaegen2-platform-policy-handler project-name: 'dcaegen2-platform-policy-handler' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g project: 'dcaegen2/platform/policy-handler' + python-version: python3 + tox-dir: '.' + tox-envs: 'py3' stream: - 'master': branch: 'master' - 'frankfurt': branch: 'frankfurt' + build-node: ubuntu1804-docker-8c-8g mvn-settings: 'dcaegen2-platform-policy-handler-settings' - # due to a strange macro / variable translation problem this needs - # to be passed as a string block to properly get the properties - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true + subproject: + - 'policy-handler': + pattern: 'policyhandler/**' + path: 'policyhandler' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{subproject}-python-staging-{stream}' + - '{project-name}-{subproject}-python-release-{stream}' files: '**' archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' - project: name: dcaegen2-platform-policy-handler-sonar 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..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-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 6690f2037..ab9bb540e 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' @@ -11,7 +12,7 @@ maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g - mvn-goals: 'clean package docker:build -DpushImage' + mvn-goals: 'clean package docker:build -DpushImageTag' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -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 index 2791c379a..fb0a33445 100644..100755 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,8 +6,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 # apply to all jobs project: 'dcaegen2/services/pm-mapper' mvn-settings: 'dcaegen2-services-pm-mapper-settings' @@ -47,6 +49,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 +63,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..b0d5f99aa --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -0,0 +1,87 @@ +--- +- 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' + mvn-params: '-f components/slice-analysis-ms/pom.xml' + 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..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/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 f03cce059..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: 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 @@ -496,6 +496,15 @@ </org.jenkinsci.plugins.golang.GolangBuildWrapper> - wrapper: + name: golang114 + wrappers: + - raw: + xml: | + <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2"> + <goVersion>Golang 1.14</goVersion> + </org.jenkinsci.plugins.golang.GolangBuildWrapper> + +- wrapper: # This wrapper is required for all jobs as it configures the wrappers # needed by the eCOMP infra. name: infra-wrappers diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 7224b759e..55df274fc 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}' @@ -1081,6 +1090,8 @@ 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-docker.yaml b/jjb/integration/integration-docker.yaml index aeb50e9f9..7858acefd 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -10,6 +10,10 @@ - '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' - 'sniroemulator': pom: 'test/mocks/sniroemulator/pom.xml' pattern: 'test/mocks/sniroemulator/**' @@ -17,17 +21,11 @@ pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml' pattern: 'test/mocks/mass-pnf-sim/**' mvn-goals: 'clean package docker:build -Dcheckstyle.skip' - PNF_INSTANCES: 1 post-docker-verify-script: | #!/bin/bash set -ex # Fail build if any setup step fails cd $WORKSPACE/test/mocks/mass-pnf-sim - ./mass-pnf-sim.py bootstrap --count {PNF_INSTANCES} --urlves http://127.0.0.1:10000/eventListener/v7 --ipfileserver 127.0.0.1 --typefileserver sftp --ipstart 10.11.0.16 - ./mass-pnf-sim.py start --count {PNF_INSTANCES} - ./mass-pnf-sim.py trigger --count {PNF_INSTANCES} - ./mass-pnf-sim.py status --count {PNF_INSTANCES} - ./mass-pnf-sim.py stop --count {PNF_INSTANCES} - ./mass-pnf-sim.py clean + tox mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 99647507b..a6d3695ea 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -31,6 +31,22 @@ default: '{html-files}' description: 'File name to be used by HTML publisher plugin to produce the report' +- parameter: + name: integration-terraform-version + parameters: + - string: + name: TERRAFORM_VERSION + default: '{terraform-version}' + description: 'Terraform version to install on minion' + +- parameter: + name: integration-terragrunt-version + parameters: + - string: + name: TERRAGRUNT_VERSION + default: '{terragrunt-version}' + description: 'Terragrunt version to install on minion' + - builder: name: integration-install-robotframework builders: @@ -64,9 +80,35 @@ sudo apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant vagrant plugin install vagrant-libvirt vagrant plugin install vagrant-disksize + vagrant plugin install vagrant-sshfs + vagrant plugin install vagrant-reload mkdir -p ~/.ssh - builder: + name: integration-install-terraform + builders: + - shell: | + #!/bin/bash + set -ex + cd /tmp + wget -q https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip + unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip + sudo mv terraform /usr/local/bin/ + terraform version + +- builder: + name: integration-install-terragrunt + builders: + - shell: | + #!/bin/bash + set -ex + cd /tmp + wget -q https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/terragrunt_linux_amd64 + sudo mv terragrunt_linux_amd64 /usr/local/bin/terragrunt + sudo chmod +x /usr/local/bin/terragrunt + terragrunt --version + +- builder: name: integration-docker-compose-logs builders: - shell: !include-raw: shell/docker-compose-logs.sh 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..77be42b97 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,39 @@ 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' + +- job-template: + <<: *tox_verify_boilerplate + name: '{project-name}-{stream}-{subproject}-terraform-verify' + terraform-version: 0.13.2 + terragrunt-version: 0.24.1 + python-version: python3 + id: integration-terraform-verify + description: 'Job intended for validating terraform modules' + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + - lf-infra-tox-parameters: + tox-dir: '{tox-dir}' + tox-envs: '{tox-envs}' + - integration-terraform-version: + terraform-version: '{terraform-version}' + - integration-terragrunt-version: + terragrunt-version: '{terragrunt-version}' + + builders: + - integration-install-terraform + - integration-install-terragrunt + - lf-infra-tox-install: + python-version: '{python-version}' + - lf-infra-tox-run: + parallel: 'false' diff --git a/jjb/integration/integration-terraform.yaml b/jjb/integration/integration-terraform.yaml new file mode 100644 index 000000000..2a7fc5dcf --- /dev/null +++ b/jjb/integration/integration-terraform.yaml @@ -0,0 +1,27 @@ +--- +- project: + name: integration-terraform-info + project: integration/terraform + project-name: integration-terraform + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: integration-terraform-validate + project: integration/terraform + project-name: integration-terraform + jobs: + - integration-terraform-verify + subproject: + - 'openlab': + tox-dir: 'openlab' + tox-envs: 'terraform' + pattern: 'openlab/**' + - 'terragrunt': + tox-dir: 'terragrunt' + tox-envs: 'terragrunt' + pattern: 'terragrunt/**' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 5b211d745..6296ff12d 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -21,14 +21,15 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'integration-settings' - build-node: 'centos7-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'test-vcpe': path: 'test/vcpe' pattern: 'test/vcpe/**' + - 'ran-nssmf-simulator': + path: 'test/mocks/ran-nssmf-simulator' + pattern: 'test/mocks/ran-nssmf-simulator/**' jobs: - '{project-name}-{stream}-{subproject}-verify-python' @@ -46,7 +47,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-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml new file mode 100644 index 000000000..f144dfa26 --- /dev/null +++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml @@ -0,0 +1,37 @@ +--- +- project: + name: integration-5G-core-nf-simulator-info + project-name: integration-5G-core-nf-simulator + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/simulators/5G-core-nf-simulator + branch: master + +- project: + name: integration-5G-core-nf-simulator-linters + project: integration/simulators/5G-core-nf-simulator + project-name: integration-5G-core-nf-simulator + 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/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 @@ -61,6 +61,22 @@ 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 project-name: integration-pnf-simulator diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index 895854a55..aea005d17 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -1,5 +1,31 @@ --- - project: + name: integration-simulators-ran-simulator + project-name: integration-simulators-ran-simulator + stream: + - 'master': + branch: 'master' + project: 'integration/simulators/ran-simulator' + mvn-settings: 'integration-simulators-ran-simulator-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' + +- project: name: integration-simulators-ran-simulator-info project-name: integration-simulators-ran-simulator jobs: diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml new file mode 100644 index 000000000..5cbce4e84 --- /dev/null +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -0,0 +1,113 @@ +--- +- project: + name: integration-xtesting-info + project-name: integration-xtesting + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/xtesting + branch: master + +- project: + name: integration-xtesting-linters + project: integration/xtesting + project-name: integration-xtesting + 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' + +- 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-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 + cron: '@daily' + container-tag-method: stream diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml index 62d07a710..fac518140 100644 --- a/jjb/lf-infra-releasedockerhub.yaml +++ b/jjb/lf-infra-releasedockerhub.yaml @@ -16,9 +16,9 @@ disable-job: false disabled: '{disable-job}' - # Runs once a week + # Runs once a day triggers: - - timed: '@weekly' + - timed: '@daily' # Define needed parameters for lf-infra-docker-login parameters: diff --git a/jjb/integration/xtesting/info-integration-xtesting.yaml b/jjb/lf-infra-sandbox-3.yaml index babd9f64f..6f496d5bb 100644 --- a/jjb/integration/xtesting/info-integration-xtesting.yaml +++ b/jjb/lf-infra-sandbox-3.yaml @@ -1,9 +1,9 @@ --- - project: - name: integration-xtesting-info - project-name: integration-xtesting + name: sandbox-3 + project-name: sandbox-3 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g - project: integration/xtesting + 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-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index da9827bc0..d61066323 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -12,8 +12,8 @@ pom: 'azure/pom.xml' pattern: 'azure/**' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' +# - '{project-name}-{stream}-verify-java' +# - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: 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-info.yaml b/jjb/multicloud/multicloud-info.yaml new file mode 100644 index 000000000..d3b5ddeb0 --- /dev/null +++ b/jjb/multicloud/multicloud-info.yaml @@ -0,0 +1,29 @@ +--- + +- project: + name: multicloud-info + project-name: multicloud + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: multicloud + branch: master + +- project: + name: multicloud-windriver-info + project-name: multicloud-windriver + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: multicloud/openstack/windriver + branch: master + +- project: + name: multicloud-oom-info + project-name: multicloud-oom + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: multicloud/oom + branch: master + 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..ff4a3f808 --- /dev/null +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml @@ -0,0 +1,18 @@ +# 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" + - "postprocessor": + 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/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml new file mode 100644 index 000000000..bb0b2dde0 --- /dev/null +++ b/jjb/oom/oom-consul.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: oom-consul-project-view + project-name: oom-consul + views: + - project-view + +- project: + name: oom-consul-info + project: oom/consul + project-name: oom-consul + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 2c0d585ad..88c2384e2 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -31,8 +31,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'optf-cmso-settings' java-version: openjdk11 @@ -74,8 +74,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'optf-cmso-settings' java-version: openjdk11 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/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index c657540f1..516ec8495 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -66,8 +66,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'optf-has-settings' - project: diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 2607b1f3f..c5a91f272 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -7,8 +7,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -67,8 +67,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'optf-osdf-settings' - project: diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 34a7a6448..8d8321c88 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -31,6 +31,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-apex-pdp-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 4c4c47d66..3c9579685 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-api-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 006ad3b95..e3e0ce80e 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-common-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 38759ff5f..16025c0a8 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -9,6 +9,8 @@ stream: - 'master': branch: master + - 'frankfurt': + branch: frankfurt functionality: - 'apex-pdp' trigger_jobs: @@ -26,6 +28,8 @@ stream: - 'master': branch: master + - 'frankfurt': + branch: frankfurt functionality: - 'distribution' trigger_jobs: @@ -42,6 +46,8 @@ stream: - 'master': branch: master + - 'frankfurt': + branch: frankfurt functionality: - 'api' trigger_jobs: @@ -59,6 +65,8 @@ stream: - 'master': branch: master + - 'frankfurt': + branch: frankfurt functionality: - 'xacml-pdp' trigger_jobs: @@ -76,6 +84,8 @@ stream: - 'master': branch: master + - 'frankfurt': + branch: frankfurt functionality: - 'pap' trigger_jobs: @@ -92,6 +102,8 @@ stream: - 'master': branch: master + - 'frankfurt': + branch: frankfurt functionality: - 'drools-pdp' trigger_jobs: @@ -108,6 +120,8 @@ stream: - 'master': branch: master + - 'frankfurt': + branch: frankfurt functionality: - 'drools-applications' trigger_jobs: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 9cb4ca0b6..8788f5da1 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-distribution-settings' java-version: openjdk11 files: '**' 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 d255266f4..166f5ca09 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -25,12 +25,15 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-drools-applications-settings' java-version: openjdk11 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 6440e3578..cc056ce93 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-drools-pdp-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 9f8030a79..b1df14f7a 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -23,8 +23,8 @@ project: 'policy/engine' stream: - - 'master': - branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-engine-settings' java-version: openjdk11 files: '**' @@ -32,25 +32,6 @@ 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: 'master' - mvn-settings: 'policy-engine-settings' - java-version: openjdk11 - mvn-goals: 'clean install' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' - -- project: name: policy-engine-clm jobs: - gerrit-maven-clm: @@ -58,7 +39,7 @@ nexus-iq-namespace: 'onap-' project: policy/engine project-name: 'policy-engine' - branch: 'master' + branch: 'frankfurt' mvn-settings: 'policy-engine-settings' java-version: openjdk11 build-node: 'ubuntu1804-builder-4c-4g' @@ -70,4 +51,4 @@ - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g project: policy/engine - branch: master + branch: frankfurt diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 0b9e63799..a3a7b31e2 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-models-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 75c9e22ea..3bf16e61a 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-pap-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 7901d4fd5..8d803fa5d 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-parent-settings' java-version: openjdk11 files: '**' diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index a4982aaae..4607aec95 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -25,6 +25,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'policy-xacml-pdp-settings' java-version: openjdk11 files: '**' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index dca6674d6..32c9333c5 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'release-3.2.0': - branch: 'release-3.2.0' + - 'release-3.3.0': + branch: 'release-3.3.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 325d79ac4..cb6bc9ebf 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'release-3.2.0': - branch: 'release-3.2.0' + - 'guilin': + branch: 'guilin' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml index 017218aa8..a4cec8374 100644 --- a/jjb/rtdv3/rtdv3.yaml +++ b/jjb/rtdv3/rtdv3.yaml @@ -24,7 +24,8 @@ comment-contains-value: remerge$ jobs: - rtdv3-global-verify - - rtdv3-global-merge + - rtdv3-global-merge: + build-timeout: 30 stream: - master: branch: '*' diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index fe8d56c83..4eb680401 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -5,6 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}-testng' - '{project-name}-{stream}-csit-{functionality}-testng' project-name: 'sdc' + disabled: true recipients: 'ofir.sonsino@intl.att.com' stream: - 'master': diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml deleted file mode 100644 index bd2f1d43f..000000000 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ /dev/null @@ -1,87 +0,0 @@ ---- -- project: - name: sdc-dcae-d-project-view - project-name: sdc-dcae-d - views: - - project-view - -- project: - name: sdc-dcae-d-ci - project-name: 'sdc-dcae-d-ci' - 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 - maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'sdc/dcae-d/ci' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-dcae-d-ci-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -#- project: -# name: sdc-dcae-d-ci-arm64 -# project-name: 'sdc-dcae-d-ci-arm64' -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-DskipTests=true' -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# project: 'sdc/dcae-d/ci' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-dcae-d-ci-settings' -# files: '**' -# archive-artifacts: '' -# build-timeout: 60 -# -- project: - name: sdc-dcae-ci-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: 'sdc/dcae-d/ci' - project-name: 'sdc-dcae-d-ci' - branch: 'master' - mvn-settings: 'sdc-dcae-d-ci-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-ci-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/ci - project-name: 'sdc-dcae-d-ci' - branch: 'master' - mvn-settings: 'sdc-dcae-d-ci-settings' - -- project: - name: sdc-dcae-d-ci-info - project-name: sdc-dcae-d-ci - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/ci - branch: master diff --git a/jjb/sdc/sdc-dcae-d-csit.yaml b/jjb/sdc/sdc-dcae-d-csit.yaml deleted file mode 100644 index a8a8f3eed..000000000 --- a/jjb/sdc/sdc-dcae-d-csit.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: sdc-dcae-d-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'sdc-dcae-d' - recipients: 'ofir.sonsino@intl.att.com' - stream: - - 'master': - branch: 'master' - functionality: - - 'dcaed': - trigger_jobs: - - 'sdc-{stream}-docker-version-java-daily' - - '{project-name}-dt-be-main-{stream}-docker-version-java-daily' - - '{project-name}-dt-{stream}-docker-version-java-daily' - - '{project-name}-fe-{stream}-docker-version-java-daily' - - '{project-name}-tosca-lab-{stream}-docker-java-daily' - robot-options: '' diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml deleted file mode 100644 index 0fdee27c1..000000000 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ /dev/null @@ -1,84 +0,0 @@ ---- -- project: - name: sdc-dcae-d-dt-be-main - project-name: 'sdc-dcae-d-dt-be-main' - 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 - maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'sdc/dcae-d/dt-be-main' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-main-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -#- project: -# name: sdc-dcae-d-dt-be-main-arm64 -# project-name: 'sdc-dcae-d-dt-be-main-arm64' -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-DskipTests=true' -# project: 'sdc/dcae-d/dt-be-main' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-dcae-d-dt-be-main-settings' -# build-node: ubuntu1804-docker-arm64-4c-2g -# files: '**' -# archive-artifacts: '' -# build-timeout: 60 -# -- project: - name: sdc-dcae-d-dt-be-main-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: 'sdc/dcae-d/dt-be-main' - project-name: 'sdc-dcae-d-dt-be-main' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-main-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-dt-be-main-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/dt-be-main - project-name: 'sdc-dcae-d-dt-be-main' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-main-settings' - -- project: - name: sdc-dcae-d-dt-be-main-info - project-name: sdc-dcae-d-dt-be-main - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/dt-be-main - branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml deleted file mode 100644 index 71801952b..000000000 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- project: - name: sdc-dcae-d-dt-be-property - project-name: 'sdc-dcae-d-dt-be-property' - 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: 'sdc/dcae-d/dt-be-property' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-property-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -- project: - name: sdc-dcae-d-dt-be-property-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: 'sdc/dcae-d/dt-be-property' - project-name: 'sdc-dcae-d-dt-be-property' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-property-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-dt-be-property-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/dt-be-property - project-name: 'sdc-dcae-d-dt-be-property' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-be-property-settings' - -- project: - name: sdc-dcae-d-dt-be-property-info - project-name: sdc-dcae-d-dt-be-property - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/dt-be-property - branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml deleted file mode 100644 index 41847c34f..000000000 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ /dev/null @@ -1,87 +0,0 @@ ---- -- project: - name: sdc-dcae-d-dt - project-name: 'sdc-dcae-d-dt' - 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 - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P server,docker -DskipTests=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'sdc/dcae-d/dt' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -#- project: -# name: sdc-dcae-d-dt-arm64 -# project-name: 'sdc-dcae-d-dt-arm64' -# build-node: ubuntu1804-docker-arm64-4c-2g -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# docker-pom: 'pom.xml' -# mvn-profile: 'server,docker' -# mvn-params: '-DskipTests=true' -# project: 'sdc/dcae-d/dt' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-dcae-d-dt-settings' -# files: '**' -# archive-artifacts: '' -# build-timeout: 60 -# -- project: - name: sdc-dcae-d-dt-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: 'sdc/dcae-d/dt' - project-name: 'sdc-dcae-d-dt' - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-dt-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/dt - project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'sdc-dcae-d-dt-settings' - -- project: - name: sdc-dcae-d-dt-info - project-name: sdc-dcae-d-dt - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/dt - branch: master diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml deleted file mode 100644 index fa80c5370..000000000 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -- project: - name: sdc-dcae-d-fe - project-name: 'sdc-dcae-d-fe' - 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 - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'sdc/dcae-d/fe' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-dcae-d-fe-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - -#- project: -# name: sdc-dcae-d-fe-arm64 -# project-name: 'sdc-dcae-d-fe-arm64' -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-DskipTests=true' -# project: 'sdc/dcae-d/fe' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-dcae-d-fe-settings' -# files: '**' -# archive-artifacts: '' -# build-timeout: 60 -# -- project: - name: sdc-dcae-d-fe-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: 'sdc/dcae-d/fe' - project-name: 'sdc-dcae-d-fe' - branch: 'master' - mvn-settings: 'sdc-dcae-d-fe-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-fe-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/dcae-d/fe - project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'sdc-dcae-d-fe-settings' - -- project: - name: sdc-dcae-d-fe-info - project-name: sdc-dcae-d-fe - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/fe - branch: master diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml deleted file mode 100644 index 1165d58cb..000000000 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ /dev/null @@ -1,73 +0,0 @@ ---- -- project: - name: sdc-dcae-d-tosca-lab - project-name: 'sdc-dcae-d-tosca-lab' - project: 'sdc/dcae-d/tosca-lab' - stream: - - 'master': - branch: 'master' - subproject: - - dcae-d-tosca-lab: - path: '.' - pattern: '**' - mvn-settings: 'sdc-dcae-d-tosca-lab-settings' - build-node: ubuntu1804-docker-8c-8g - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P default -Dmaven.test.skip=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - docker-pom: 'pom.xml' - mvn-profile: 'default' - -#- project: -# name: sdc-dcae-d-tosca-lab-arm64 -# project-name: 'sdc-dcae-d-tosca-lab-arm64' -# project: 'sdc/dcae-d/tosca-lab' -# stream: -# - 'master': -# branch: 'master' -# subproject: -# - dcae-d-tosca-lab: -# path: '.' -# pattern: '**' -# mvn-settings: 'sdc-dcae-d-tosca-lab-settings' -# build-node: ubuntu1804-docker-arm64-4c-2g -# jobs: -# - '{project-name}-{stream}-docker-java-daily': -# mvn-params: '-Dmaven.test.skip=true' -# docker-pom: 'pom.xml' -# mvn-profile: 'default' -# -- project: - name: sdc-dcae-d-tosca-lab-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-docker-8c-8g - project: 'sdc/dcae-d/tosca-lab' - project-name: 'sdc-dcae-d-tosca-lab' - branch: 'master' - mvn-settings: 'sdc-dcae-d-tosca-lab-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-dcae-d-tosca-lab-info - project-name: sdc-dcae-d-tosca-lab - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/dcae-d/tosca-lab - branch: master diff --git a/jjb/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml deleted file mode 100644 index 0aad2486a..000000000 --- a/jjb/sdc/sdc-microservices.yaml +++ /dev/null @@ -1,74 +0,0 @@ ---- -- project: - name: sdc-microservices-project-view - project-name: sdc-microservices - views: - - project-view - -- project: - name: sdc-microservices - project-name: 'sdc-microservices' - 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 - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-v1-8c-8g - maven-versions-plugin: true - mvn-params: '-DskipTests=true' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - subproject: - - 'catalog-facade-ms': - pom: 'catalog-facade-ms/pom.xml' - pattern: 'catalog-facade-ms/**' - project: 'sdc/microservices' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-microservices-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - maven-version: 'mvn35' - -- project: - name: sdc-microservices-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: 'sdc/microservices' - project-name: 'sdc-microservices' - branch: 'master' - mvn-settings: 'sdc-microservices-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' - -- project: - name: sdc-microservices-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: sdc/microservices - project-name: 'sdc-microservices' - branch: 'master' - mvn-settings: 'sdc-microservices-settings' - -- project: - name: sdc-microservices-info - project-name: sdc-microservices - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdc/microservices - branch: master diff --git a/jjb/sdc/sdc-onap-ui-react.yaml b/jjb/sdc/sdc-onap-ui-react.yaml deleted file mode 100644 index 45b97928a..000000000 --- a/jjb/sdc/sdc-onap-ui-react.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: sdc-onap-ui-react-info - project-name: 'sdc-onap-ui-react' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'sdc/onap-ui-react' - branch: 'master' - -- project: - name: sdc-onap-ui-react - project-name: 'sdc-onap-ui-react' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - project: 'sdc/onap-ui-react' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdc-onap-ui-react-settings' - files: '**' - archive-artifacts: '' - build-timeout: 60 - maven-version: 'mvn35' - -- project: - name: sdc-onap-ui-react-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: 'sdc/onap-ui-react' - project-name: 'sdc-onap-ui-react' - branch: 'master' - mvn-settings: 'sdc-onap-ui-react-settings' - mvn-params: '-Dsonar.branch={branch}' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m' 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 018a649f8..c64d17e89 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,13 +18,20 @@ - project-view - project: + name: sdc-project-view + project-name: sdc + views: + - project-view + +- project: name: sdc project-name: 'sdc' jobs: - '{project-name}-{stream}-verify-java': - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P docker -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + build-node: 'ubuntu1804-docker-8c-16g' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu1804-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-8c-16g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' @@ -39,7 +40,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true @@ -56,6 +57,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'sdc-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g @@ -90,42 +92,30 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar" cron: '@daily' - build-node: ubuntu1804-docker-8c-8g + build-node: ubuntu1804-docker-8c-16g project: 'sdc' project-name: 'sdc' branch: 'master' mvn-settings: 'sdc-settings' - mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + java-version: openjdk11 + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' - project: - name: sdc-clm-catalog + name: sdc-clm jobs: - gerrit-maven-clm: build-timeout: 120 submodule-timeout: 30 - mvn-params: '-P catalog -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' nexus-iq-namespace: 'onap-' project: sdc - project-name: 'sdc-catalog' - build-node: ubuntu1804-docker-8c-8g - branch: 'master' - mvn-settings: 'sdc-settings' - -- project: - name: sdc-clm-onboarding - jobs: - - gerrit-maven-clm: - build-timeout: 120 - submodule-timeout: 30 - mvn-params: '-P onboarding -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - nexus-iq-namespace: 'onap-' - project: sdc - project-name: 'sdc-onboarding' + project-name: 'sdc' build-node: ubuntu1804-docker-8c-8g branch: 'master' mvn-settings: 'sdc-settings' + java-version: openjdk11 - project: name: sdc-info @@ -150,3 +140,4 @@ mvn-clean-install: true project: 'sdc' branch: master + java-version: openjdk11 diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 0b04a27f7..d3cc5fe01 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -30,8 +30,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index ee7c79dd1..95b1f9098 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -17,8 +17,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: "mvn36" mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 8cba7aac3..e0cc01394 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -26,8 +26,10 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' + java-version: openjdk11 + mvn-version: "mvn36" mvn-settings: 'sdnc-oam-settings' maven-version: "mvn35" files: '**' diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml deleted file mode 100644 index ae86ef5bf..000000000 --- a/jjb/sdnc/sdnc-oom.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -- project: - name: sdnc-oom - helm-module: 'sdnc' - project-name: 'sdnc-oom' - project: 'sdnc/oom' - jobs: - - '{project-name}-{stream}-verify-external-helm' - - '{project-name}-{stream}-merge-external-helm': - build_script: '{oom_build_script}' - post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: '**' - stream: - - 'master': - branch: 'master' - - mvn-settings: 'sdnc-oom-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-helm-2c-1g - pre_build_script: !include-raw-escape: shell/helm-repo-init.sh - oom_build_script: | - #!/bin/bash - set -e -o pipefail - cd kubernetes/ - make all - build_script: | - #!/bin/bash - cd kubernetes/ - make common - make {helm-module} - oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - -- project: - name: sdnc-oom-info - project-name: sdnc-oom - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: sdnc/oom - branch: master 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..a515ee934 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 @@ -28,6 +31,7 @@ - project: name: so-libs-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -39,6 +43,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 +51,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 new file mode 100644 index 000000000..b1b3f54c2 --- /dev/null +++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml @@ -0,0 +1,45 @@ +--- +- project: + name: testsuite-pythonsdk-tests-info + project-name: testsuite-pythonsdk-tests + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: testsuite/pythonsdk-tests + branch: master + +- 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/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml new file mode 100644 index 000000000..50a1558f3 --- /dev/null +++ b/jjb/testsuite/testsuite-cds.yaml @@ -0,0 +1,8 @@ +--- +- project: + name: testsuite-cds-info + project: testsuite/cds + project-name: testsuite-cds + 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-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml deleted file mode 100644 index cb438381f..000000000 --- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vfc-nfvo-catalog-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-catalog' - recipients: 'yangyanyj@chinamobile.com' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' 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/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-' |