update subproject name

Issue-ID: MODELING-160
Change-Id: Iae90d13f64518f94d582120957ff68a347fcbcef
Signed-off-by: yangyan <yangyanyj@chinamobile.com>

diff --git a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml
index a4683f5..032881c 100644 (file)
--- a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml
+++ b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: modeling-toscaparsers-genericparser-csit
+    name: modeling-genericparser-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'modeling-toscaparsers-genericparser'
+    project-name: 'modeling-genericparser'
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs: 'modeling-toscaparsers-genericparser-master-docker-java-version-shell-daily'
+          trigger_jobs: 'modeling-genericparser-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'
\ No newline at end of file

diff --git a/jjb/modeling/modeling-toscaparsers-genericparser.yaml b/jjb/modeling/modeling-toscaparsers-genericparser.yaml
index 7821fcd..f21e60c 100644 (file)
--- a/jjb/modeling/modeling-toscaparsers-genericparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-genericparser.yaml
@@ -1,15 +1,15 @@
 ---
 
 - project:
-    name: modeling-toscaparsers-genericparser
-    project-name: 'modeling-toscaparsers-genericparser'
+    name: modeling-genericparser
+    project-name: 'modeling-genericparser'
     project: 'modeling/genericparser'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'modeling-genericparser-settings'
     subproject:
-      - 'catalog':
+      - 'genericparser':
           path: '.'
           pattern: '**'
     jobs:
@@ -28,32 +28,32 @@
     build-node: centos7-redis-4c-4g
 
 - project:
-    name: modeling-toscaparsers-genericparser-sonar
+    name: modeling-genericparser-sonar
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
     build-node: centos7-redis-4c-4g
     project: 'modeling/genericparser'
-    project-name: 'modeling-toscaparsers-genericparser'
+    project-name: 'modeling-genericparser'
     branch: 'master'
     mvn-settings: 'modeling-genericparser-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
-    name: modeling-toscaparsers-genericparser-clm
+    name: modeling-genericparser-clm
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: modeling/genericparser
-    project-name: 'modeling-toscaparsers-genericparser'
+    project-name: 'modeling-genericparser'
     build-node: centos7-redis-4c-4g
     branch: 'master'
     mvn-settings: 'modeling-genericparser-settings'
 
 - project:
-    name: modeling-toscaparsers-genericparser-info
-    project-name: modeling-toscaparsers-genericparser
+    name: modeling-genericparser-info
+    project-name: modeling-genericparser
     jobs:
       - gerrit-info-yaml-verify
     project: modeling/genericparser