summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2020-03-20 16:55:12 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-20 16:55:12 +0000
commitab8fe7de7a743b1a2ad7a59c3f310c761d80742c (patch)
tree3d5327e58e839e6b65361316709cf187a4ed7c1a
parent164028459a576fad278999c1d6ac6cbae99c3b70 (diff)
parent06af5a3ae4c02279e19e9899e01acfaab6af6673 (diff)
Merge "Revert "add Multiarch jobs for policy-pap with docker.io repository""
-rw-r--r--jjb/policy/policy-pap.yaml45
1 files changed, 7 insertions, 38 deletions
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 2bc95a325..97dc5675a 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -5,52 +5,21 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java':
- project-name: 'policy-pap-amd64'
docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
- build-node: ubuntu1804-docker-8c-8g
- pattern: 'do_not_match_any_file'
- - '{project-name}-{stream}-merge-java':
- project-name: 'policy-pap-arm64'
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
- build-node: ubuntu1804-docker-arm64-4c-2g
- pattern: 'do_not_match_any_file'
+ mvn-params: '-P docker'
+ build-node: ubuntu1604-docker-8c-8g
- 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-name}-multiarch-{stream}-merge-java':
- build-node: ubuntu1804-docker-8c-8g
- - gerrit-maven-docker-stage:
- project-name: 'policy-pap-arm64'
- build-node: ubuntu1804-docker-arm64-4c-2g
- maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
- container-public-registry: 'docker.io'
- container-staging-registry: 'docker.io'
- cron: ''
- gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: 'do_not_match_any_file'
- gerrit-maven-docker-stage:
- project-name: 'policy-pap-amd64'
- build-node: centos7-docker-8c-8g
+ build-node: ubuntu1604-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
- container-public-registry: 'docker.io'
- container-staging-registry: 'docker.io'
- cron: ''
- gerrit_trigger_file_paths:
- - compare-type: REG_EXP
- pattern: 'do_not_match_any_file'
- - '{project-name}-docker-manifest-{stream}':
+ mvn-params: '-P docker -Dmaven.test.skip=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-name}-multiarch-docker-stage-{stream}'
project: 'policy/pap'
stream: