summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2020-08-11 14:39:16 +0000
committerGerrit Code Review <gerrit@onap.org>2020-08-11 14:39:16 +0000
commit7815cc6f1c4114ac817e7d7e6837e7314638f149 (patch)
tree235eed90f785aedf12c5702082389c8457c460bd
parent0668a4286fcbcc531f4847503a5a1a30b7572fef (diff)
parentc8da0469802eb9b3ed64c2d19304d72702f3a2ff (diff)
Merge "Fixed jenkins jobs cert-service"
-rw-r--r--jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml2
-rw-r--r--jjb/oom-platform-cert-service/oom-platform-cert-service.yaml4
2 files changed, 4 insertions, 2 deletions
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index 5cf656acf..33d89f943 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -11,5 +11,5 @@
functionality:
- "certservice":
trigger_jobs:
- - "{project-name}-{stream}-merge-java"
+ - "oom-platform-cert-service-{stream}-merge-java"
robot-options: ""
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 99a63873b..5bcd5f327 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -69,10 +69,12 @@
- project:
name: oom-platform-cert-service-clm
+ java-version: openjdk11
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
- project: 'oom/platform/cert-service'
+ project: oom/platform/cert-service
project-name: 'oom-platform-cert-service'
branch: 'master'
+ build-node: ubuntu1804-docker-8c-8g
mvn-settings: 'oom-platform-cert-service-settings'