From d9ebc2a17336f1a5e39a819136cc62d8889a4ba9 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Fri, 23 May 2014 10:31:33 +0400
Subject: [PATCH] Rename murano-api repo to murano

Murano is moving to the common approach of using single server side repo.

Change-Id: I0c3484264e0b0be46a2b3669129b01e303c7c87e
---
 .../files/gerritbot_channel_config.yaml        |  2 +-
 .../jenkins_job_builder/config/murano.yaml     |  6 +++---
 .../jenkins_job_builder/config/projects.yaml   |  2 +-
 .../files/review.projects.yaml                 |  6 ++----
 .../openstack_project/files/zuul/layout.yaml   | 18 +++++++++---------
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index a4cee23119..5dafd7a80e 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -302,8 +302,8 @@ murano:
       - change-merged
       - x-vrif-minus-2
     projects:
+      - stackforge/murano
       - stackforge/murano-agent
-      - stackforge/murano-api
       - stackforge/murano-conductor
       - stackforge/murano-dashboard
       - stackforge/murano-deployment
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml b/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml
index 9a01913d15..9b6a6095bc 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml
@@ -17,18 +17,18 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
           export ENABLED_SERVICES=murano,murano-api,murano-engine,tempest
-          export PROJECTS="stackforge/murano-api $PROJECTS"
+          export PROJECTS="stackforge/murano $PROJECTS"
           export PROJECTS="stackforge/murano-dashboard $PROJECTS"
           export PROJECTS="stackforge/python-muranoclient $PROJECTS"
 
           function pre_test_hook {
-              cd /opt/stack/new/murano-api/functionaltests
+              cd /opt/stack/new/murano/functionaltests
               ./pre_test_hook.sh
           }
           export -f pre_test_hook
 
           function post_test_hook {
-              cd /opt/stack/new/murano-api/functionaltests
+              cd /opt/stack/new/murano/functionaltests
               ./post_test_hook.sh
           }
           export -f post_test_hook
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 1c86c4e4b4..940024db11 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -71,7 +71,7 @@
       - pypi-jobs
 
 - project:
-    name: murano-api
+    name: murano
     github-org: stackforge
     node: bare-precise
     tarball-site: tarballs.openstack.org
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 5542a0e91c..84b8299526 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -713,14 +713,12 @@
   upstream: git://github.com/rakhmerov/mistral-extra.git
   acl-config: /home/gerrit2/acls/stackforge/mistral.config
 - project: stackforge/MRaaS
+- project: stackforge/murano
+  upstream: git://github.com/Mirantis/murano-api.git
 - project: stackforge/murano-agent
   group: murano
   upstream: git://github.com/Mirantis/murano-agent.git
   acl-config: /home/gerrit2/acls/stackforge/murano.config
-- project: stackforge/murano-api
-  group: murano
-  upstream: git://github.com/Mirantis/murano-api.git
-  acl-config: /home/gerrit2/acls/stackforge/murano.config
 - project: stackforge/murano-common
   group: murano
   upstream: git://github.com/sergmelikyan/murano-common.git
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 05fa8bea5e..d3d5a048c4 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -530,7 +530,7 @@ jobs:
     voting: false
   - name: gate-python-muranoclient-python33
     voting: false
-  - name: gate-murano-api-requirements
+  - name: gate-murano-requirements
     voting: false
   - name: gate-python-muranoclient-requirements
     voting: false
@@ -3961,21 +3961,21 @@ projects:
     gate:
       - noop
 
-  - name: stackforge/murano-api
+  - name: stackforge/murano
     template:
       - name: python-jobs
     check:
-      - gate-murano-api-requirements
+      - gate-murano-requirements
       - gate-murano-devstack-dsvm
     post:
-      - murano-api-branch-tarball
-      - hook-murano-api-rtfd
+      - murano-branch-tarball
+      - hook-murano-rtfd
     pre-release:
-      - murano-api-tarball
-      - hook-murano-api-rtfd
+      - murano-tarball
+      - hook-murano-rtfd
     release:
-      - murano-api-tarball
-      - hook-murano-api-rtfd
+      - murano-tarball
+      - hook-murano-rtfd
 
   - name: stackforge/murano-common
     check: