summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-03-26 07:24:49 -0400
committerPamela Dragosh <pdragosh@research.att.com>2020-03-26 08:55:06 -0400
commit365d441bca259bbab70f5e7234f067cf1ee60446 (patch)
treed2d18807e7dc119316f07bd4fe303444448d0a9a
parent6a543746fd5178718ba8fbb2e79c58292c3a3c46 (diff)
Skip tests in docker stage job
Not all our jobs have skipTests - since both a verify job is run it isn't necessary for the docker build job to run the JUnit tests in addition to the verify job which will catch any issues. Also bumping some projectd to use ubuntu 18.04. apex sonar jobs should be run in 8c/8g node. fixing enabled vs disabled for policy/gui Issue-ID: POLICY-2378 Change-Id: I3a0aad6c2280fa5c2cb56b592c6093814f38deb1 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--jjb/policy/policy-apex-pdp.yaml8
-rw-r--r--jjb/policy/policy-docker-base-common.yaml14
-rw-r--r--jjb/policy/policy-drools-applications.yaml2
-rw-r--r--jjb/policy/policy-drools-pdp.yaml8
-rw-r--r--jjb/policy/policy-engine.yaml2
-rw-r--r--jjb/policy/policy-gui.yaml4
6 files changed, 19 insertions, 19 deletions
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 1923c765e..42cfd7c6e 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -19,9 +19,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker'
+ mvn-params: '-P docker maven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -35,7 +35,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-apex-pdp-sonar
@@ -47,7 +47,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-8c-8g
project: 'policy/apex-pdp'
project-name: 'policy-apex-pdp'
branch: 'master'
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 5688d1fd0..61ac6feed 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -8,9 +8,9 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: "-P docker"
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
@@ -25,7 +25,7 @@
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-docker-base-common
@@ -37,7 +37,7 @@
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: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
pattern: 'do_not_match_any_file'
- '{project-name}-{stream}-merge-java':
project-name: 'policy-docker-arm64'
@@ -60,7 +60,7 @@
pattern: 'do_not_match_any_file'
- gerrit-maven-docker-stage:
project-name: 'policy-docker-amd64'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-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'
@@ -70,7 +70,7 @@
- compare-type: REG_EXP
pattern: 'do_not_match_any_file'
- '{project-name}-docker-manifest-{stream}':
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- '{project-name}-multiarch-docker-stage-{stream}'
# - '{project-name}-gerrit-release-jobs':
# build-node: centos7-docker-8c-8g
@@ -82,7 +82,7 @@
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: policy-docker-clm
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 7935f3300..32c42574a 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -15,7 +15,7 @@
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker'
+ 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':
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 25b45e0fc..6440e3578 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -13,9 +13,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker'
+ 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':
@@ -29,7 +29,7 @@
java-version: openjdk11
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: policy-drools-pdp-sonar
@@ -41,7 +41,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'policy/drools-pdp'
project-name: 'policy-drools-pdp'
branch: 'master'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 0ebc274b8..1f6eb30a1 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -15,7 +15,7 @@
- gerrit-maven-docker-stage:
build-node: ubuntu1604-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-P docker'
+ 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':
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 5b8253651..862c04031 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -18,10 +18,10 @@
mvn-params: '-P docker -Dmaven.test.skip=true'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- enabled: false
+ disabled: true
- '{project-name}-gerrit-release-jobs':
build-node: centos7-builder-4c-4g
- enabled: false
+ disabled: true
project: 'policy/gui'
stream: