Merge "Remove job A1 Policy Management Service"

diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 72e0eec..97737c4 100644 (file)
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -12,3 +12,62 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- informationcoordinatorservice_jdk_common: &informationcoordinatorservice_jdk_common
+    name: informationcoordinatorservice-jdk-common
+    # git repo
+    project: nonrtric/plt/informationcoordinatorservice
+    # jenkins job name prefix
+    project-name: nonrtric-plt-informationcoordinatorservice
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-settings
+    mvn-version: mvn36
+    java-version: openjdk11
+
+- project:
+    <<: *informationcoordinatorservice_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
+
+# nonrtric:informationcoordinatorservice
+# Maven artifacts for nonrtric-plt-informationcoordinatorservice
+- project:
+    <<: *informationcoordinatorservice_jdk_common
+    name: nonrtric-plt-informationcoordinatorservice
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *informationcoordinatorservice_jdk_common
+    name: nonrtric-plt-informationcoordinatorservice-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *informationcoordinatorservice_jdk_common
+    name: nonrtric-plt-informationcoordinatorservice-sonar
+    project-name: '{name}'
+    # template goal install builds docker image unnecessarily
+    mvn-params: '-Ddocker.skip=true'
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-informationcoordinatorservice'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index eb1a50b..bf4cd35 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -91,29 +91,6 @@
       - e-release:
           branch: e-release
 
-# nonrtric:information-coordinator-service
-# Maven artifacts for nonrtric-information-coordinator-service
-- project:
-    <<: *nonrtric_jdk_common
-    name: nonrtric-information-coordinator-service
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
-    mvn-params: '-f information-coordinator-service'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'information-coordinator-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:enrichment-coordinator-service
 # Maven artifacts for nonrtric-enrichment-coordinator-service
 - project: