Refactoring CCSDK Jobs to run with mvn36

[ci-management.git] / jjb / ccsdk / ccsdk-oran.yaml

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index fd25f14..971356d 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -16,7 +16,6 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn36"
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -25,11 +24,11 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
-    java-version: openjdk11
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-docker-8c-8g
@@ -58,8 +57,8 @@
     project: 'ccsdk/oran'
     project-name: 'ccsdk-oran'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
-    java-version: openjdk11