diff options
Diffstat (limited to 'jjb/dcaegen2')
-rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 1 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-deployments.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-cli.yaml | 56 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml (renamed from jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml) | 24 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml | 33 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml | 15 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 40 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-prh.yaml | 3 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-sdk.yaml | 4 |
12 files changed, 96 insertions, 92 deletions
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index e2d63007f..54d831285 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'elalto': branch: 'elalto' # apply to all jobs @@ -36,6 +37,7 @@ - project: name: dcaegen2-collectors-hv-ves-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -45,6 +47,7 @@ build-node: ubuntu1604-docker-8c-8g mvn-settings: 'dcaegen2-collectors-hv-ves-settings' + - project: name: dcaegen2-collectors-hv-ves-info project-name: dcaegen2-collectors-hv-ves diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index fc12da490..f9a7823a2 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -34,6 +34,7 @@ - project: name: dcaegen2-collectors-ves-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar cron: '@daily' diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index cb0f944a3..18f6feffa 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -6,7 +6,8 @@ - '{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/deployments' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml deleted file mode 100644 index 613ef12d3..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -- project: - name: dcaegen2-platform-cli - project-name: 'dcaegen2-platform-cli' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'dcaegen2/platform/cli' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dcaegen2-platform-cli-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: 'ubuntu1604-docker-8c-8g' - -- project: - name: dcaegen2-platform-cli-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'dcaegen2/platform/cli' - project-name: 'dcaegen2-platform-cli' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-cli-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/cli - build-node: ubuntu1604-docker-8c-8g - project-name: 'dcaegen2-platform-cli' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-settings' - -- project: - name: dcaegen2-platform-cli-info - project-name: dcaegen2-platform-cli - jobs: - - gerrit-info-yaml-verify - project: dcaegen2/platform/cli - branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 3851bb6fc..4973e6dc1 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -6,7 +6,8 @@ - '{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/deployment-handler' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index 22a68a2a0..859badcdc 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -1,8 +1,8 @@ --- - project: - name: dcaegen2-platform-cli-bp-gen - project: 'dcaegen2/platform/cli' - project-name: 'dcaegen2-platform-cli' + name: dcaegen2-platform-mod-bpgenerator + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' @@ -12,20 +12,18 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - version-properties-file: 'blueprint-generator/version.properties' - mvn-pom: 'blueprint-generator/pom.xml' - mvn-params: '-f blueprint-generator/pom.xml' - pattern: 'blueprint-generator/**' + version-properties-file: 'mod/bpgenerator/version.properties' + mvn-pom: 'mod/bpgenerator/pom.xml' + mvn-params: '-f mod/bpgenerator/pom.xml' + pattern: 'mod/bpgenerator/**' subproject: - - 'blueprint-gen': - pom: 'blueprint-generator/pom.xml' - pattern: 'blueprint-generator/**' + - 'bpgenerator': + pom: 'mod/bpgenerator/pom.xml' + pattern: 'mod/bpgenerator/**' stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dcaegen2-platform-cli-settings' + mvn-settings: 'dcaegen2-platform-settings' maven-deploy-properties: | deployAtEnd=true files: '**' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml new file mode 100644 index 000000000..2402dd06c --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: dcaegen2-platform-mod-designtool + project-name: dcaegen2-platform-mod + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - designtool: + pom: 'mod/designtool/pom.xml' + pattern: 'mod/designtool/**' + stream: + - 'master': + branch: 'master' + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + + +- project: + name: dcaegen2-platform-mod-designtool-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/platform + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-mod-designtool' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index e476fbfeb..d94cb2758 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -21,6 +21,20 @@ build-node: ubuntu1604-docker-8c-8g - project: + name: dcaegen2-platform-mod-genprocessor-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod-genprocessor' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/genprocessor/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: name: dcaegen2-platform-mod-genprocessor-clm jobs: - gerrit-maven-clm @@ -31,3 +45,4 @@ mvn-params: '-f mod/genprocessor/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 a93fd571b..4d6da5365 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -6,7 +6,8 @@ - '{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' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 44f8155b0..81c70d15f 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -20,28 +20,28 @@ archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' -#- project: -# name: dcaegen2-services-datalake-handler-release -# project: 'dcaegen2/services' -# project-name: 'dcaegen2-services-datalake-handler' -# 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: ubuntu1604-docker-8c-8g -# mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml' -# container-public-registry: 'nexus3.onap.org:10001' -# container-staging-registry: 'nexus3.onap.org:10003' -# pattern: 'components/datalake-handler/**' +- project: + name: dcaegen2-services-datalake-handler-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler' + 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: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'components/datalake-handler/**' stream: - 'master': - branch: 'master' + branch: 'master' mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index cb9130f59..d137b21bd 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -20,6 +20,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'elalto': branch: 'elalto' mvn-settings: 'dcaegen2-services-prh-settings' @@ -35,6 +36,7 @@ - gerrit-maven-sonar cron: '@daily' build-node: ubuntu1604-docker-8c-8g + java-version: openjdk11 project: 'dcaegen2/services/prh' project-name: 'dcaegen2-services-prh' branch: 'master' @@ -49,6 +51,7 @@ nexus-iq-namespace: 'onap-' project: dcaegen2/services/prh build-node: ubuntu1604-docker-8c-8g + java-version: openjdk11 project-name: 'dcaegen2-services-prh' branch: 'master' mvn-settings: 'dcaegen2-services-prh-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 5d3e2e28e..30ebe8baa 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -16,6 +16,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'elalto': branch: 'elalto' mvn-settings: 'dcaegen2-services-sdk-settings' @@ -27,6 +28,7 @@ - project: name: dcaegen2-services-sdk-integration-pairwise + java-version: openjdk11 jobs: - '{project-name}-{stream}-integration-pairwise': build-env-variables: "TESTCONTAINERS_RYUK_DISABLED=true" @@ -41,6 +43,7 @@ - project: name: dcaegen2-services-sdk-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar cron: '@daily' @@ -54,6 +57,7 @@ - project: name: dcaegen2-services-sdk-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' |