Merge "Add jobs for nonrtric-plt-sdnca1controller"

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index cd57f7c..1d3634f 100644 (file)
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -20,7 +20,7 @@
     # jenkins job name prefix
     project-name: nonrtric-plt-a1policymanagementservice
     # maven settings file has docker credentials
-    mvn-settings: nonrtric-settings
+    mvn-settings: nonrtric-plt-a1policymanagementservice-settings
     mvn-version: mvn36
     java-version: openjdk11
 

diff --git a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
index a747bf2..24485e5 100644 (file)
--- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
+++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml
@@ -12,3 +12,34 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- helmmanager_jdk_common: &helmmanager_jdk_common
+    name: helmmanager-jdk-common
+    # git repo
+    project: nonrtric/plt/helmmanager
+    # jenkins job name prefix
+    project-name: nonrtric-plt-helmmanager
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-helmmanager-settings
+    mvn-version: mvn36
+    java-version: openjdk11
+
+- project:
+    <<: *helmmanager_jdk_common
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *helmmanager_jdk_common
+    name: nonrtric-plt-helmmanager-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 97737c4..6b09c64 100644 (file)
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -20,7 +20,7 @@
     # jenkins job name prefix
     project-name: nonrtric-plt-informationcoordinatorservice
     # maven settings file has docker credentials
-    mvn-settings: nonrtric-settings
+    mvn-settings: nonrtric-plt-informationcoordinatorservice-settings
     mvn-version: mvn36
     java-version: openjdk11
 

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index e90741b..bf4cd35 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -41,29 +41,6 @@
       - e-release:
           branch: e-release
 
-# nonrtric:a1-policy-management-service/
-# Maven artifacts for nonrtric-a1-policy-management-service/
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-a1-policy-management-service
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f a1-policy-management-service/'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'a1-policy-management-service/.*'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - master:
-          branch: master
-      - e-release:
-          branch: e-release
-
 # nonrtric:policy-agent/
 # Maven artifacts for nonrtric-policy-agent/
 - project: