diff options
Diffstat (limited to 'jjb/dcaegen2')
7 files changed, 28 insertions, 41 deletions
diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index 49a1d5337..fa3ad68c6 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -13,7 +13,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: 'ubuntu1604-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' build-timeout: 300 jobs: - '{project-name}-{stream}-verify-java' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 0b97d5abc..197660a4e 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -25,7 +25,10 @@ mvn-goals: 'clean deploy docker:build -DpushImage' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true - project: name: dcaegen2-analytics-tca-gen2-sonar jobs: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index c07a54608..d31538d80 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -20,7 +20,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' build-timeout: 180 - project: diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 685582e51..3f561407a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -50,7 +50,17 @@ stream: all branch: '*' - gerrit-docker-verify - - gerrit-docker-merge + - gerrit-docker-merge: + post_docker_build_script: | + #!/bin/bash + set -uex -o pipefail + DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}} + DNAME={container-snapshot-registry}/{docker-name} + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest + docker push $DNAME:$DOCKER_IMAGE_TAG2 + docker push $DNAME:latest + - gerrit-maven-clm: mvn-params: '-f {src-dir}' stream: master diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index a3fd2edce..eec174ab5 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -72,7 +72,7 @@ branch: 'master' mvn-settings: 'dcaegen2-services-settings' mvn-params: '-f components/bbs-event-processor/pom.xml' - mvn-goals: 'clean install' + mvn-goals: 'clean install -Ddockerfile.skip' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index c8e76d939..4b43e2c5e 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -39,8 +39,6 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' pattern: 'components/datalake-handler/**' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g stream: - 'master': branch: 'master' @@ -70,39 +68,6 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' pattern: 'components/datalake-handler/**' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-services-settings' - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' - -- project: - name: dcaegen2-services-datalake-handler-db-init-release - project: 'dcaegen2/services' - project-name: 'dcaegen2-services-datalake-handler-db-init' - 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/init_db/pom.xml' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - pattern: 'components/datalake-handler/**' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index be95546f1..1c2dd5984 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -57,7 +57,16 @@ stream: master branch: 'master' - gerrit-docker-verify - - gerrit-docker-merge + - gerrit-docker-merge: + post_docker_build_script: | + #!/bin/bash + set -uex -o pipefail + DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}} + DNAME={container-snapshot-registry}/{docker-name} + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 + docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest + docker push $DNAME:$DOCKER_IMAGE_TAG2 + docker push $DNAME:latest - gerrit-whitesource-scan: build-timeout: 120 submodule-timeout: 30 |