Fixes building docker images
Standardized jjb configuration for building docker images
Change-Id: I08668b64ad5f257361cc1a760d882f234259350a
Issue-ID: AAF-995
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
index 92c5386..8efdb43 100644
--- a/jjb/aaf/aaf-certservice.yaml
+++ b/jjb/aaf/aaf-certservice.yaml
@@ -2,42 +2,34 @@
- project:
name: aaf-certservice
project-name: 'aaf-certservice'
- subproject: 'aaf-certservice-ws'
- path: 'certService'
- java-version: openjdk11
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java':
- build-node: 'ubuntu1604-docker-v1-8c-8g'
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- mvn-pom: 'certService/pom.xml'
- - gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-v1-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: 'aaf/certservice'
stream:
- - 'master':
- branch: 'master'
+ - 'master':
+ branch: 'master'
+ java-version: openjdk11
+ project: 'aaf/certservice'
mvn-settings: 'aaf-certservice-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: '**'
+ maven-deploy-properties: |
+ deployAtEnd=true
archive-artifacts: ''
- build-node: 'ubuntu1604-docker-8c-8g'
+ build-node: ubuntu1604-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: ubuntu1604-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: aaf-certservice-sonar