From 5a4da8679933a2485e8b90a2ba5450c18ed5c1d1 Mon Sep 17 00:00:00 2001
From: dyh <dengyuanhong@chinamobile.com>
Date: Thu, 5 Sep 2019 09:46:28 +0800
Subject: [PATCH] Update jjb subproject name for modeling/etsicatalog

Change-Id: I210cba2e1bd7ed785da0d6ac3dc6c26fa69acaed
Issue-ID: MODELING-218
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
---
 ... => build-modeling-etsicatalog-docker-image.sh} |  0
 ...er-csit.yaml => modeling-etsicatalog-csit.yaml} |  6 ++--
 ...enericparser.yaml => modeling-etsicatalog.yaml} | 34 +++++++++++-----------
 3 files changed, 20 insertions(+), 20 deletions(-)
 rename jjb/modeling/{build-modeling-genericparser-docker-image.sh => build-modeling-etsicatalog-docker-image.sh} (100%)
 rename jjb/modeling/{modeling-toscaparsers-genericparser-csit.yaml => modeling-etsicatalog-csit.yaml} (54%)
 rename jjb/modeling/{modeling-toscaparsers-genericparser.yaml => modeling-etsicatalog.yaml} (60%)

diff --git a/jjb/modeling/build-modeling-genericparser-docker-image.sh b/jjb/modeling/build-modeling-etsicatalog-docker-image.sh
similarity index 100%
rename from jjb/modeling/build-modeling-genericparser-docker-image.sh
rename to jjb/modeling/build-modeling-etsicatalog-docker-image.sh
diff --git a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml
similarity index 54%
rename from jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml
rename to jjb/modeling/modeling-etsicatalog-csit.yaml
index 032881c2c..76ebd4f20 100644
--- a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml
+++ b/jjb/modeling/modeling-etsicatalog-csit.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: modeling-genericparser-csit
+    name: modeling-etsicatalog-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'modeling-genericparser'
+    project-name: 'modeling-etsicatalog'
     stream: 'master'
     functionality:
       - 'sanity-check':
-          trigger_jobs: 'modeling-genericparser-master-docker-java-version-shell-daily'
+          trigger_jobs: 'modeling-etsicatalog-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-etsicatalog.yaml
similarity index 60%
rename from jjb/modeling/modeling-toscaparsers-genericparser.yaml
rename to jjb/modeling/modeling-etsicatalog.yaml
index 88ab33255..2c04e233c 100644
--- a/jjb/modeling/modeling-toscaparsers-genericparser.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -1,15 +1,15 @@
 ---
 
 - project:
-    name: modeling-genericparser
-    project-name: 'modeling-genericparser'
-    project: 'modeling/genericparser'
+    name: modeling-etsicatalog
+    project-name: 'modeling-etsicatalog'
+    project: 'modeling/etsicatalog'
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'modeling-genericparser-settings'
+    mvn-settings: 'modeling-etsicatalog-settings'
     subproject:
-      - 'genericparser':
+      - 'etsicatalog':
           path: '.'
           pattern: '**'
     jobs:
@@ -24,40 +24,40 @@
           docker-pom: 'pom.xml'
           mvn-goals: 'install'
           script:
-            !include-raw-escape: 'build-modeling-genericparser-docker-image.sh'
+            !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh'
           build-node: ubuntu1604-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     build-node: centos7-redis-4c-4g
 
 - project:
-    name: modeling-genericparser-sonar
+    name: modeling-etsicatalog-sonar
     jobs:
       - gerrit-maven-sonar
     cron: '@daily'
     build-node: centos7-redis-4c-4g
-    project: 'modeling/genericparser'
-    project-name: 'modeling-genericparser'
+    project: 'modeling/etsicatalog'
+    project-name: 'modeling-etsicatalog'
     branch: 'master'
-    mvn-settings: 'modeling-genericparser-settings'
+    mvn-settings: 'modeling-etsicatalog-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
-    name: modeling-genericparser-clm
+    name: modeling-etsicatalog-clm
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
-    project: modeling/genericparser
-    project-name: 'modeling-genericparser'
+    project: modeling/etsicatalog
+    project-name: 'modeling-etsicatalog'
     build-node: centos7-redis-4c-4g
     branch: 'master'
-    mvn-settings: 'modeling-genericparser-settings'
+    mvn-settings: 'modeling-etsicatalog-settings'
 
 - project:
-    name: modeling-genericparser-info
-    project-name: modeling-genericparser
+    name: modeling-etsicatalog-info
+    project-name: modeling-etsicatalog
     jobs:
       - gerrit-info-yaml-verify
-    project: modeling/genericparser
+    project: modeling/etsicatalog
     branch: master
-- 
2.16.6