diff options
42 files changed, 290 insertions, 582 deletions
diff --git a/global-jjb b/global-jjb -Subproject c8b9acd166fcbd88139a65f7721e522980a0e01 +Subproject bee1d1152f7fd19e81ef23344011541d1d66a09 diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml deleted file mode 100644 index 8d65de839..000000000 --- a/jjb/aaf/aaf-luaplugin.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-luaplugin-clm - project-name: 'aaf-luaplugin' - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aaf/luaplugin' - branch: 'master' - mvn-settings: 'aaf-luaplugin-settings' - -- project: - name: aaf-luaplugin-info - project-name: aaf-luaplugin - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/luaplugin - branch: master diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml deleted file mode 100644 index 599754303..000000000 --- a/jjb/aaf/aaf-sms.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-sms - project-name: 'aaf-sms' - subproject: 'aaf-sms-client' - path: 'sms-service/src' - golangver: 'golang111' - jobs: - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - '{project-name}-{stream}-verify-golang' - - '{project-name}-{stream}-merge-golang' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - mvn-pom: 'sms-client/java/pom.xml' - mvn-params: '-f sms-client/java/pom.xml' - - '{project-name}-{stream}-docker-golang-shell-daily': - script: - !include-raw-escape: 'build-sms-docker-image.sh' - project: 'aaf/sms' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'aaf-sms-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: aaf-sms-info - project-name: aaf-sms - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/sms - branch: master diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml deleted file mode 100644 index b3a45fbf4..000000000 --- a/jjb/aaf/aaf-sshsm.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-sshsm - project-name: 'aaf-sshsm' - build-timeout: 120 - project: 'aaf/sshsm' - jobs: - - gerrit-verify-c: - script: - !include-raw-escape: 'build-sshsm.sh' - - gerrit-docker-c-shell-daily: - script: - !include-raw-escape: 'build-sshsm-docker-images.sh' - stream: - - 'master': - branch: 'master' - - mvn-settings: 'aaf-sshsm-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: aaf-sshsm-info - project-name: aaf-sshsm - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/sshsm - branch: master diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml deleted file mode 100644 index 26764c615..000000000 --- a/jjb/appc/appc-cdt.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: appc-cdt - project-name: 'appc-cdt' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'appc/cdt' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-cdt-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: appc-cdt-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'appc/cdt' - project-name: 'appc-cdt' - branch: 'master' - mvn-settings: 'appc-cdt-settings' - - -- project: - name: appc-cdt-info - project-name: appc-cdt - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: appc/cdt - branch: master diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml deleted file mode 100644 index edffd6bf8..000000000 --- a/jjb/appc/appc-deployment.yaml +++ /dev/null @@ -1,80 +0,0 @@ ---- - -- project: - name: appc-deployment - project-name: 'appc-deployment' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - project: 'appc/deployment' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-deployment-settings' - maven-version: "mvn35" - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1804-builder-4c-4g - -- project: - name: appc-deployment-docker - project-name: 'appc-deployment' - jobs: - - 'docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - - 'docker-version-java-daily': - mvn-params: '-Dmaven.test.skip=true' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-params: '-Dmaven.test.skip=true -P docker' - maven-versions-plugin: true - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'appc/deployment' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-deployment-settings' - maven-version: "mvn35" - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1804-docker-8c-8g - -#- project: -# name: appc-deployment-arm64-docker -# project-name: 'appc-deployment-arm64' -# jobs: -# - 'docker-java-daily': -# mvn-params: '-Dmaven.test.skip=true' -# - 'docker-version-java-daily': -# mvn-params: '-Dmaven.test.skip=true' -# project: 'appc/deployment' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'appc-deployment-settings' -# files: '**' -# archive-artifacts: '' -# docker-pom: 'pom.xml' -# mvn-profile: docker -# build-node: ubuntu1804-docker-arm64-4c-2g - -- project: - name: appc-deployment-info - project-name: appc-deployment - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: appc/deployment - branch: master diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml deleted file mode 100644 index c717284e7..000000000 --- a/jjb/appc/appc-parent.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- project: - name: appc-project-view - project-name: appc - views: - - project-view - -- project: - name: appc-parent - project-name: 'appc-parent' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'appc/parent' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-parent-settings' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g - -- project: - name: appc-parent-info - project-name: appc-parent - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: appc/parent - branch: master diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml index 4d2239f08..a265e84de 100644 --- a/jjb/cps/cps-csit.yaml +++ b/jjb/cps/cps-csit.yaml @@ -4,10 +4,10 @@ jobs: - '{project-name}-review-verification-maven-{stream}': mvn-goals: clean install - mvn-params: '-Dmaven.test.skip=true -Dnexus.repository= -Pcps-xnf-docker' + mvn-params: '-Dmaven.test.skip=true -Dnexus.repository=' - '{project-name}-merge-verification-maven-{stream}': mvn-goals: clean install - mvn-params: '-Dmaven.test.skip=true -Dnexus.repository= -Pcps-xnf-docker' + mvn-params: '-Dmaven.test.skip=true -Dnexus.repository=' project-name: 'cps' recipients: 'toine.siebelink@est.tech' # project name in gerrit diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 04306f39f..cecfb790d 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -38,7 +38,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' - mvn-params: "-P cps-xnf-docker" + mvn-params: "-P cps-ncmp-docker" - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g @@ -46,7 +46,7 @@ - gerrit-maven-docker-stage: build-node: centos7-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P cps-xnf-docker' + mvn-params: '-P cps-ncmp-docker' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 25449e87c..a9efd7210 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -18,6 +18,7 @@ - 'honolulu': branch: 'honolulu' java-version: openjdk11 + maven-version: 'mvn35' mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml deleted file mode 100644 index 7da843a86..000000000 --- a/jjb/dmaap/dmaap-buscontroller-csit.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- project: - name: dmaap-buscontroller-csit - jobs: - - '{project-name}-{stream}-csit-{functionality}' - - '{project-name}-{stream}-verify-csit-{functionality}' - project-name: 'dmaap-buscontroller' - recipients: 'fiachra.corcoran@est.tech' - stream: - - 'master': - branch: 'master' - functionality: - - 'with_mr': - trigger_jobs: - - '{project-name}-maven-docker-stage-{stream}' - - 'with_dr': - trigger_jobs: - - '{project-name}-maven-docker-stage-{stream}' - robot-options: '' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 2c3de532a..5531bb9f4 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -9,7 +9,6 @@ name: dmaap-buscontroller-java11 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 @@ -22,6 +21,24 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-buscontroller-settings' + files: '**' + archive-artifacts: '' + java-version: openjdk11 + +- project: + name: dmaap-buscontroller-maintenance-java11 + project-name: 'dmaap-buscontroller-maintenance' + 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: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -30,9 +47,46 @@ files: '**' archive-artifacts: '' java-version: openjdk11 + cron: '' -# 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. +- project: + name: dmaap-buscontroller-csit + jobs: + - '{project-name}-review-verification-maven-{stream}': + mvn-goals: clean install + mvn-params: '-P docker -DskipTests=true' + - '{project-name}-merge-verification-maven-{stream}': + mvn-goals: clean install + mvn-params: '-P docker' + project-name: 'dmaap-buscontroller' + recipients: 'fiachra.corcoran@est.tech' + project: 'dmaap/buscontroller' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + mvn-settings: 'dmaap-buscontroller-settings' + robot-options: '' + +- project: + name: dmaap-buscontroller-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: 'dmaap/buscontroller' + project-name: 'dmaap-buscontroller' + branch: 'master' + mvn-settings: 'dmaap-buscontroller-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-buscontroller-clm @@ -43,6 +97,7 @@ project-name: 'dmaap-buscontroller' branch: 'master' mvn-settings: 'dmaap-buscontroller-settings' + java-version: openjdk11 - project: name: dmaap-buscontroller-info diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml deleted file mode 100644 index e991363d0..000000000 --- a/jjb/dmaap/dmaap-datarouter-csit.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- project: - name: dmaap-datarouter-csit-ssl - jobs: - - '{project-name}-{stream}-csit-{functionality}' - - '{project-name}-{stream}-verify-csit-{functionality}' - project-name: 'dmaap-datarouter' - recipients: 'fiachra.corcoran@est.tech' - stream: - - 'master': - branch: 'master' - functionality: - - 'ssl-dr-suite': - trigger_jobs: - - '{project-name}-maven-docker-stage-{stream}' - robot-options: '' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index de41a4835..b79f2ed54 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -47,6 +47,22 @@ cron: '' - project: + name: dmaap-datarouter-csit-ssl + jobs: + - '{project-name}-{stream}-csit-{functionality}' + - '{project-name}-{stream}-verify-csit-{functionality}' + project-name: 'dmaap-datarouter' + recipients: 'fiachra.corcoran@est.tech' + stream: + - 'master': + branch: 'master' + functionality: + - 'ssl-dr-suite': + trigger_jobs: + - '{project-name}-maven-docker-stage-{stream}' + robot-options: '' + +- project: name: dmaap-datarouter-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml deleted file mode 100644 index b61a15cab..000000000 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- -- project: - name: dmaap-dbcapi-java11 - 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-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' - - 'honolulu': - branch: 'honolulu' - - 'guilin': - branch: 'guilin' - # 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-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: 'dmaap/dbcapi' - project-name: 'dmaap-dbcapi' - branch: 'master' - mvn-settings: 'dmaap-dbcapi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - java-version: openjdk11 - -- project: - name: dmaap-dbcapi-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dmaap/dbcapi - project-name: 'dmaap-dbcapi' - branch: 'master' - mvn-settings: 'dmaap-dbcapi-settings' - java-version: openjdk11 - -- project: - name: dmaap-dbcapi-info - project-name: dmaap-dbcapi - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dmaap/dbcapi - branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-csit.yaml b/jjb/dmaap/dmaap-messagerouter-csit.yaml deleted file mode 100644 index 109cbcc18..000000000 --- a/jjb/dmaap/dmaap-messagerouter-csit.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- project: - name: dmaap-csit - jobs: - - '{project-name}-{stream}-csit-{functionality}' - - '{project-name}-{stream}-verify-csit-{functionality}' - project-name: 'dmaap' - recipients: 'fiachra.corcoran@est.tech' - stream: - - 'master': - branch: 'master' - functionality: - - 'mrpubsub': - trigger_jobs: - - '{project-name}-maven-docker-stage-{stream}' - robot-options: '' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index b1855ea8f..3e7ba92bd 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-dmaapclient - project-name: 'dmaap-messagerouter-dmaapclient' + name: dmaap-messagerouter-dmaapclient-java11 + project-name: 'dmaap-messagerouter-dmaapclient-java11' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -15,6 +15,23 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' + files: '**' + archive-artifacts: '' + java-version: openjdk11 + +- project: + name: dmaap-messagerouter-dmaapclient-maintenance + project-name: 'dmaap-messagerouter-dmaapclient-maintenance' + 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/messagerouter/dmaapclient' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -22,6 +39,7 @@ mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-messagerouter-dmaapclient-sonar @@ -40,6 +58,7 @@ mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-messagerouter-dmaapclient-clm @@ -50,6 +69,7 @@ project-name: 'dmaap-messagerouter-dmaapclient' branch: 'master' mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' + java-version: openjdk11 - project: name: dmaap-messagerouter-dmaapclient-info diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml index e469a1d60..42c312b94 100644 --- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml +++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml @@ -17,6 +17,24 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-kafka11aaf-settings' + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-kafka-maintenance + project-name: 'dmaap-kafka-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dmaap/kafka11aaf' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -24,6 +42,7 @@ mvn-settings: 'dmaap-kafka11aaf-settings' files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-kafka-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 64e940591..9ad2d2e23 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -1,14 +1,10 @@ --- - project: - name: dmaap-messagerouter-messageservice - project-name: 'dmaap-messagerouter-messageservice' + name: dmaap-messagerouter-messageservice-java-11 + project-name: 'dmaap-messagerouter-messageservice-java-11' 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 mvn-params: '-P docker -Dmaven.test.skip=true' @@ -21,6 +17,27 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-messagerouter-messageservice-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + +- project: + name: dmaap-messagerouter-messageservice-maintenance + project-name: 'dmaap-messagerouter-messageservice-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-params: '-P docker -Dmaven.test.skip=true' + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dmaap/messagerouter/messageservice' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -30,6 +47,23 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: 'docker' + cron: '' + +- project: + name: dmaap-csit + jobs: + - '{project-name}-{stream}-csit-{functionality}' + - '{project-name}-{stream}-verify-csit-{functionality}' + project-name: 'dmaap' + recipients: 'fiachra.corcoran@est.tech' + stream: + - 'master': + branch: 'master' + functionality: + - 'mrpubsub': + trigger_jobs: + - '{project-name}-maven-docker-stage-{stream}' + robot-options: '' - project: name: dmaap-messagerouter-messageservice-sonar @@ -48,6 +82,7 @@ mvn-settings: 'dmaap-messagerouter-messageservice-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-messagerouter-messageservice-clm @@ -58,6 +93,7 @@ project-name: 'dmaap-messagerouter-messageservice' branch: 'master' mvn-settings: 'dmaap-messagerouter-messageservice-settings' + java-version: openjdk11 - project: name: dmaap-messagerouter-messageservice-info diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index e5dd58872..1d476f91c 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -11,11 +11,26 @@ maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'dmaap/messagerouter/mirroragent' stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-messagerouter-mirroragent-settings' + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-messagerouter-mirroragent-maintenance + project-name: 'dmaap-messagerouter-mirroragent-maintenance' + 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: true8g + project: 'dmaap/messagerouter/mirroragent' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -23,6 +38,7 @@ mvn-settings: 'dmaap-messagerouter-mirroragent-settings' files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-messagerouter-mirroragent-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 1772783ec..69dee313b 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-msgrtr - project-name: 'dmaap-messagerouter-msgrtr' + name: dmaap-messagerouter-msgrtr-java-11 + project-name: 'dmaap-messagerouter-msgrtr-java-11' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -11,11 +11,27 @@ maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'dmaap/messagerouter/msgrtr' stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-messagerouter-msgrtr-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-messagerouter-msgrtr + project-name: 'dmaap-messagerouter-msgrtr' + 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/messagerouter/msgrtr' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -23,6 +39,7 @@ mvn-settings: 'dmaap-messagerouter-msgrtr-settings' files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-messagerouter-msgrtr-sonar @@ -41,6 +58,7 @@ mvn-settings: 'dmaap-messagerouter-msgrtr-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: dmaap-messagerouter-msgrtr-clm @@ -51,6 +69,7 @@ project-name: 'dmaap-messagerouter-msgrtr' branch: 'master' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' + java-version: openjdk11 - project: name: dmaap-messagerouter-msgrtr-info diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml index d704af6b5..3258275e9 100644 --- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml +++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml @@ -15,6 +15,25 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-zookeeper-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: dmaap-zookeeper-maintenance + project-name: 'dmaap-zookeeper-maintenance' + jobs: + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-params: '-P docker -Dmaven.test.skip=true' + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dmaap/zookeeper' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -25,6 +44,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' build-node: ubuntu1804-docker-8c-8g + cron: '' - project: name: dmaap-zookeeper-info diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 94f6deffb..94d9d3af6 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -23,6 +23,10 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'holmes-common-settings' files: '**' archive-artifacts: '' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 85322581e..2b6aeef26 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -21,6 +21,10 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'holmes-engine-management-settings' files: '**' archive-artifacts: '' diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 9aa9c9dbe..00791b131 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -21,6 +21,10 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'holmes-rule-management-settings' files: '**' archive-artifacts: '' diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh index 9ca248c7d..d10b0f014 100644 --- a/jjb/integration/include-raw-integration-install-robotframework.sh +++ b/jjb/integration/include-raw-integration-install-robotframework.sh @@ -18,12 +18,12 @@ set -exu # Make sure pip itself us up-to-date. pip install --upgrade pip -pip install --upgrade --no-binary pycparser pycparser -pip install --upgrade pyOpenSSL==16.2.0 docker-py importlib requests scapy netifaces netaddr ipaddr simplejson demjson -pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library,xvfb}} +pip install --no-binary pycparser==2.20 pycparser==2.20 +pip install pyOpenSSL==16.2.0 docker-py==1.10.6 importlib==1.0.4 requests==2.25.1 scapy==2.4.4 netifaces==0.10.9 netaddr==0.8.0 ipaddr==2.2.0 simplejson==3.17.2 demjson==2.2.4 +pip install robotframework-httplibrary==0.4.2 robotframework-requests==0.8.2 robotframework-sshlibrary==3.6.0 robotframework-selenium2library==1.8.0 robotframework-xvfb==1.2.2 -pip install xvfbwrapper -pip install PyVirtualDisplay +pip install xvfbwrapper==0.2.9 +pip install PyVirtualDisplay==2.1 # Print installed versions. pip freeze diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 6d2c88286..5ac5d8d5e 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -43,6 +43,8 @@ branch: 'frankfurt' - 'guilin': branch: 'guilin' + - 'honolulu': + branch: 'honolulu' - project: name: integration-xtesting-release @@ -111,6 +113,9 @@ - 'master': branch: 'master' files: '' + - 'honolulu': + branch: 'honolulu' + files: '' - 'guilin': branch: 'guilin' files: '' diff --git a/jjb/modeling/modeling-modelspec.yaml b/jjb/modeling/modeling-modelspec.yaml new file mode 100644 index 000000000..1cae6b721 --- /dev/null +++ b/jjb/modeling/modeling-modelspec.yaml @@ -0,0 +1,9 @@ +--- +- project: + name: modeling-modelspec-info + project-name: modeling-modelspec + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: modeling/modelspec + branch: master diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml index d3b5ddeb0..c1aa85e86 100644 --- a/jjb/multicloud/multicloud-info.yaml +++ b/jjb/multicloud/multicloud-info.yaml @@ -27,3 +27,11 @@ project: multicloud/oom branch: master +- project: + name: multicloud-k8s-info + project-name: multicloud-k8s + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: multicloud/k8s + branch: master diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index dd43c952f..88047251c 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -26,6 +26,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'multicloud-k8s-settings' files: '**' archive-artifacts: '' @@ -52,12 +54,3 @@ # files: '**' # archive-artifacts: '' # build-node: ubuntu1804-docker-arm64-4c-2g - -- project: - name: multicloud-k8s-info - project-name: multicloud-k8s - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: multicloud/k8s - branch: master diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml deleted file mode 100644 index 5f2c15496..000000000 --- a/jjb/music/music-mdbc.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -- project: - name: music-mdbc - project-name: 'music-mdbc' - 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: 'music/mdbc' - stream: - - 'master': - branch: 'master' - mvn-settings: 'music-mdbc-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - -- project: - name: music-mdbc-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: music/mdbc - project-name: 'music-mdbc' - branch: 'master' - mvn-settings: 'music-mdbc-settings' - -- project: - name: music-mdbc-info - project-name: music-mdbc - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: music/mdbc - branch: master diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml deleted file mode 100644 index 93ffe4511..000000000 --- a/jjb/music/music-prom.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- project: - name: music-prom - project-name: 'music-prom' - 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 - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - project: 'music/prom' - stream: - - 'master': - branch: 'master' - - 'casablanca': - branch: 'casablanca' - mvn-settings: 'music-prom-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - -- project: - name: music-prom-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: music/prom - project-name: 'music-prom' - branch: 'master' - mvn-settings: 'music-prom-settings' - -- project: - name: music-prom-info - project-name: music-prom - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: music/prom - branch: master diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml deleted file mode 100644 index 0d152365b..000000000 --- a/jjb/music/music.yaml +++ /dev/null @@ -1,73 +0,0 @@ ---- -- project: - name: music-project-view - project-name: music - views: - - project-view - -- project: - name: music - project-name: 'music' - 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 - 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 - project: 'music' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'music-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: music-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: 'music' - project-name: 'music' - branch: 'master' - mvn-settings: 'music-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - -- project: - name: music-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: music - project-name: 'music' - branch: 'master' - mvn-settings: 'music-settings' - -- project: - name: music-info - project-name: music - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: music - branch: master diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index fc89d0226..71ab43344 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'honolulu': + branch: 'honolulu' jobs: - '{project-name}-{stream}-review': diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml index a9a91be5c..0615907af 100644 --- a/jjb/policy/policy-csit-jobs.yaml +++ b/jjb/policy/policy-csit-jobs.yaml @@ -25,7 +25,7 @@ scm: - gerrit-trigger-scm: refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + choosing-strategy: 'default' submodule-recursive: '{submodule-recursive}' wrappers: diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 6b9da149e..c4fcc36a3 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -5,7 +5,7 @@ - '{project-name}-{stream}-verify-java': # this build is integration test only - CSIT (Verify 2/2) mvn-goals: clean install - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only' + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only' build-node: 'ubuntu1804-docker-8c-16g' archive-artifacts: > **/*.log diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index cbbcdceb5..c3b9ce346 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -66,6 +66,7 @@ project-name: 'sdc-sdc-distribution-client' branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' + java-version: openjdk11 mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' @@ -79,6 +80,7 @@ project-name: 'sdc-sdc-distribution-client' branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' + java-version: openjdk11 - project: name: sdc-sdc-distribution-client-info diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index ee0fe87ef..0fa71bef1 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -29,13 +29,13 @@ jobs: - '{project-name}-{stream}-verify-java': # this build is unit test only (Verify 1/2) - mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' build-node: 'ubuntu1804-docker-8c-8g' - '{project-name}-{stream}-sdc-merge-java': build-node: 'ubuntu1804-docker-8c-16g' docker-pom: 'pom.xml' mvn-profile: 'docker' - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' # running everything (unit tests and integration tests in a single job for merge, as we don't need // run # for merge, but still saving integration tests results and report. archive-artifacts: > @@ -51,11 +51,11 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -113,7 +113,7 @@ branch: 'master' mvn-settings: 'sdc-settings' java-version: openjdk11 - mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' @@ -123,7 +123,7 @@ - gerrit-maven-clm: build-timeout: 120 submodule-timeout: 30 - mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' nexus-iq-namespace: 'onap-' project: sdc project-name: 'sdc' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index fe6d0c13b..4e5b1c201 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -64,6 +64,8 @@ project: 'sdnc/apps' project-name: 'sdnc-apps' branch: 'master' + java-version: openjdk11 + mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -98,6 +100,8 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 + mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' - project: diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index ac7b63791..9ba264e76 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -53,7 +53,8 @@ branch: 'master' mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' - maven-version: "mvn35" + java-version: openjdk11 + mvn-version: "mvn36" mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: @@ -68,6 +69,8 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-northbound-settings' + java-version: openjdk11 + mvn-version: 'mvn36' - project: name: sdnc-northbound-info diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 391ee0e0a..7380359f0 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -71,6 +71,8 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-oam-settings' + java-version: openjdk11 + mvn-version: 'mvn36' - project: name: sdnc-oam-info diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index c694f35b7..d142a34e3 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -18,10 +18,12 @@ branch: 'honolulu' java-version: openjdk11 functionality: - - 'integration-testing': - trigger_jobs: - - 'integration-etsi-testing': - trigger_jobs: +# integration testing suites disabled until brought up to date, +# see https://jira.onap.org/browse/SO-3632 +# - 'integration-testing': +# trigger_jobs: +# - 'integration-etsi-testing': +# trigger_jobs: - 'macroflow': trigger_jobs: robot-options: '' |