diff options
| m--------- | global-jjb | 0 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml | 1 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 39 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-mapper.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 2 | ||||
| -rw-r--r-- | jjb/optf/optf-has.yaml | 2 | ||||
| -rw-r--r-- | jjb/optf/optf-osdf.yaml | 3 |
10 files changed, 29 insertions, 26 deletions
diff --git a/global-jjb b/global-jjb -Subproject 729b2e3535f009a146719df7d7b52e036b2505c +Subproject 33d8d18e8981751af8602f497e53512478ee269 diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 7f962a99a..cc8ab2af7 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -23,12 +23,12 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + mvn-goals: 'clean install -Ddocker.skip' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false' - mvn-goals: 'clean install docker:build docker:push' - project: name: dcaegen2-collectors-hv-ves-clm diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 3a5249c3c..b7f5204f0 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -13,7 +13,7 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - mvn-goals: 'clean package docker:build -DpushImage' + mvn-goals: 'clean package docker:build -DpushImageTag' project: 'dcaegen2/collectors/restconf' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 2d772d7c3..384982c6a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -13,7 +13,7 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - mvn-goals: 'clean package docker:build -DpushImage' + mvn-goals: 'clean package docker:build -DpushImageTag' project: 'dcaegen2/collectors/ves' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index 38741e150..e24155cdd 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -32,6 +32,7 @@ version-properties-file: 'components/bbs-event-processor/version.properties' mvn-pom: 'components/bbs-event-processor/pom.xml' mvn-params: '-f components/bbs-event-processor/pom.xml' + mvn-goals: 'clean package -Ddockerfile.skip -f components/bbs-event-processor/pom.xml' pattern: 'components/bbs-event-processor/**' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 9fce045a3..44f8155b0 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -20,26 +20,25 @@ 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 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/**' stream: - 'master': branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 8e6db3508..41cb2f169 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -19,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'dcaegen2-services-mapper-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index a2c56f032..bd375a659 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -13,7 +13,7 @@ build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - mvn-goals: 'clean package docker:build -DpushImage' + mvn-goals: 'clean package docker:build -DpushImageTag' project: 'dcaegen2/services/son-handler' stream: diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 238c96cfa..8fc49df1b 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -23,6 +23,8 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 14c7a17ec..b5b4dc5bd 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -22,6 +22,8 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: 'ubuntu1604-builder-4c-4g' @@ -76,6 +78,7 @@ - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: optf/osdf + build-node: ubuntu1604-builder-4c-4g project-name: 'optf-osdf' stream: - 'master': |