openstack
/
murano-deployment
Code Issues Proposed changes

Fix repository path in case of murano migration to openstack namespace 

Change-Id: Ie663a983900610e71951f9ed8561603952ff0796
This commit is contained in:
Alexey Deryugin 2015-04-20 13:38:01 +03:00
parent 17d8713596
commit a80af36e14
20 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/cirros/README.rst
View File

@ -50,7 +50,7 @@ http://alexeytorkhov.blogspot.ru/2009/09/mounting-raw-and-qcow2-vm-disk-images.h
::
>$ cd ~
>$ git clone https://github.com/stackforge/murano-deployment.git
>$ git clone https://github.com/openstack/murano-deployment.git
..
* Convert Cirros image into RAW format (skip arch which you don't need):

2
murano-ci/config/devstack/README.rst
View File

@ -26,7 +26,7 @@ As user 'stack', clone murano-deployment:
.. code-block:: console
$ cd /opt/stack
$ git clone https://github.com/stackforge/murano-deployment
$ git clone https://github.com/openstack/murano-deployment
$ cd /opt/stack/murano-deployment/murano-ci/config/devstack
..

4
murano-ci/config/devstack/build-murano-image.sh
View File

@ -76,7 +76,7 @@ runcmd:
- "yum -y update"
- "yum -y install which git"
- "mkdir -p /opt/git"
- "cd /opt/git && git clone https://github.com/stackforge/murano-agent"
- "cd /opt/git && git clone https://github.com/openstack/murano-agent"
- "cd /opt/git/murano-agent && git checkout release-0.5"
- "cd /opt/git/murano-agent && bash setup-centos.sh install"
- "rm -rf /opt/git"
@ -95,7 +95,7 @@ runcmd:
- "apt-get --yes upgrade"
- "apt-get --yes install git python-babel"
- "mkdir -p /opt/git"
- "cd /opt/git && git clone https://github.com/stackforge/murano-agent"
- "cd /opt/git && git clone https://github.com/openstack/murano-agent"
- "cd /opt/git/murano-agent && git checkout release-0.5"
- "cd /opt/git/murano-agent && bash setup.sh install"
- "rm -rf /opt/git"

4
murano-ci/config/zuul/layout.yaml
View File

@ -20,10 +20,10 @@ pipelines:
verified: 0
projects:
- name: stackforge/murano
- name: openstack/murano
check:
- murano-engine-app-deployment-tests-ubuntu
- name: stackforge/murano-dashboard
- name: openstack/murano-dashboard
check:
- murano-dashboard-integration-tests-ubuntu
- murano-dashboard-integration-tests-centos

6
murano-ci/infra/deploy_component_new.sh
View File

@ -47,7 +47,7 @@ function do_cleanup()
function prepare_component()
{
local retval=0
local git_url="https://git.openstack.org/stackforge/$COMPONENT_NAME"
local git_url="https://git.openstack.org/openstack/$COMPONENT_NAME"
local component_clone_dir="${GIT_WORKING_DIR}/${COMPONENT_NAME}"
if [ -d "$component_clone_dir" ]; then
rm -rf $component_clone_dir
@ -61,9 +61,9 @@ function prepare_component()
# "noop" used only for clean install from git
if [ "${ZUUL_REF}" != "noop" ] && [ "${ZUUL_URL}" != "noop" ]; then
bash setup.sh uninstall >> /dev/null
$GIT_CMD fetch ${ZUUL_URL}/stackforge/${COMPONENT_NAME} ${ZUUL_REF}
$GIT_CMD fetch ${ZUUL_URL}/openstack/${COMPONENT_NAME} ${ZUUL_REF}
if [ $? -ne 0 ]; then
echo "Error occured during git fetch ${ZUUL_URL}/stackforge/${COMPONENT_NAME} ${ZUUL_REF}!"
echo "Error occured during git fetch ${ZUUL_URL}/openstack/${COMPONENT_NAME} ${ZUUL_REF}!"
return 1
fi
$GIT_CMD checkout FETCH_HEAD

4
murano-ci/jobs/Build_documentation.yaml
View File

@ -5,14 +5,14 @@
block-downstream: false
scm:
- git:
url: https://github.com/stackforge/murano-docs.git
url: https://github.com/openstack/murano-docs.git
triggers:
- pollscm: "H/5 * * * *"
builders:
- shell: |
cd ~
sudo rm -rf murano-deployment
git clone https://github.com/stackforge/murano-deployment
git clone https://github.com/openstack/murano-deployment
sh -xe murano-deployment/docs-builder/builder.sh
publishers:
- email:

2
murano-ci/jobs/gate-murano-agent-integration-fedora.yaml
View File

@ -39,7 +39,7 @@
export ZUUL_REF=${ZUUL_REF:-$ZUUL_REF_OPT}
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
export DISTR_NAME='fedora'

2
murano-ci/jobs/gate-murano-agent-integration-ubuntu.yaml
View File

@ -39,7 +39,7 @@
export ZUUL_REF=${ZUUL_REF:-$ZUUL_REF_OPT}
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
export DISTR_NAME='ubuntu'

2
murano-ci/jobs/jobs-updater.yaml
View File

@ -9,7 +9,7 @@
scm:
- git:
url: https://git.openstack.org/stackforge/murano-deployment
url: https://git.openstack.org/openstack/murano-deployment
branches:
- "master"

4
murano-ci/jobs/murano-dashboard-heartbeat-cz.yaml
View File

@ -41,11 +41,11 @@
UserKnownHostsFile=/dev/null
EOF
export ZUUL_PROJECT='stackforge/murano-dashboard'
export ZUUL_PROJECT='openstack/murano-dashboard'
export ZUUL_URL='https://git.openstack.org'
export ZUUL_REF='master'
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
bash ./murano-ci/scripts/murano-integration-tests-devstack.sh
publishers:

2
murano-ci/jobs/murano-dashboard-integration-tests-centos.yaml
View File

@ -19,7 +19,7 @@
- shell: |
#!/bin/bash
sudo ntpdate -u pool.ntp.org
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
bash -x murano-ci/scripts/murano-dashboard-integration-tests.sh
publishers:

2
murano-ci/jobs/murano-dashboard-integration-tests-ubuntu.yaml
View File

@ -14,7 +14,7 @@
- shell: |
#!/bin/bash
sudo ntpdate -u pool.ntp.org
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
bash -x murano-ci/scripts/murano-dashboard-integration-tests.sh
publishers:

4
murano-ci/jobs/murano-dashboard-on-commit-cz.yaml
View File

@ -38,9 +38,9 @@
EOF
export ZUUL_REF=${ZUUL_REF:-$ZUUL_REF_OPT}
export ZUUL_PROJECT=${ZUUL_PROJECT:-'stackforge/murano-dashboard'}
export ZUUL_PROJECT=${ZUUL_PROJECT:-'openstack/murano-dashboard'}
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
bash ./murano-ci/scripts/murano-integration-tests-devstack.sh

2
murano-ci/jobs/murano-engine-app-deployment-tests-centos.yaml
View File

@ -19,7 +19,7 @@
- shell: |
#!/bin/bash
sudo ntpdate -u pool.ntp.org
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
bash -x murano-ci/scripts/murano-engine-with-deployment-tests.sh
publishers:

2
murano-ci/jobs/murano-engine-app-deployment-tests-ubuntu.yaml
View File

@ -14,7 +14,7 @@
- shell: |
#!/bin/bash
sudo ntpdate -u pool.ntp.org
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
bash -x murano-ci/scripts/murano-engine-with-deployment-tests.sh
publishers:

4
murano-ci/jobs/murano-engine-heartbeat-cz.yaml
View File

@ -41,11 +41,11 @@
UserKnownHostsFile=/dev/null
EOF
export ZUUL_PROJECT='stackforge/murano'
export ZUUL_PROJECT='openstack/murano'
export ZUUL_URL='https://git.openstack.org'
export ZUUL_REF='master'
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
bash ./murano-ci/scripts/murano-integration-tests-devstack.sh
publishers:

2
murano-ci/jobs/murano-engine-on-commit-cz.yaml
View File

@ -39,7 +39,7 @@
export ZUUL_REF=${ZUUL_REF:-$ZUUL_REF_OPT}
git clone https://git.openstack.org/stackforge/murano-deployment .
git clone https://git.openstack.org/openstack/murano-deployment .
bash ./murano-ci/scripts/murano-integration-tests-devstack.sh

2
murano-ci/scripts/build-guides.sh
View File

@ -34,7 +34,7 @@ do
guides="murano-manual murano-deployment-guide"
fi
git clone git@github.com:stackforge/murano-docs.git docs-${version}
git clone git@github.com:openstack/murano-docs.git docs-${version}
cd docs-${version}

6
murano-ci/scripts/murano-devbox-devstack.sh
View File

@ -85,13 +85,13 @@ STACK_HOME='/opt/stack'
GIT_BASE=${GIT_BASE:-https://git.openstack.org}
MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/stackforge/murano}
MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/openstack/murano}
MURANO_BRANCH=${MURANO_BRANCH:-master}
MURANO_DASHBOARD_REPO=${MURANO_DASHBOARD_REPO:-${GIT_BASE}/stackforge/murano-dashboard}
MURANO_DASHBOARD_REPO=${MURANO_DASHBOARD_REPO:-${GIT_BASE}/openstack/murano-dashboard}
MURANO_DASHBOARD_BRANCH=${MURANO_DASHBOARD_BRANCH:-master}
MURANO_PYTHONCLIENT_REPO=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/stackforge/python-muranoclient}
MURANO_PYTHONCLIENT_REPO=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-muranoclient}
MURANO_PYTHONCLIENT_BRANCH=${MURANO_PYTHONCLIENT_BRANCH:-master}
MURANO_APP_INCUBATOR_REPO=${MURANO_APP_INCUBATOR_REPO:-https://github.com/murano-project/murano-app-incubator}

16
murano-ci/scripts/murano-integration-tests-devstack.sh
View File

@ -75,12 +75,12 @@ STACK_HOME='/opt/stack'
ZUUL_URL=${ZUUL_URL:-'https://git.openstack.org'}
ZUUL_REF=${ZUUL_REF:-'master'}
ZUUL_PROJECT=${ZUUL_PROJECT:-'stackforge/murano'}
ZUUL_PROJECT=${ZUUL_PROJECT:-'openstack/murano'}
APP_INCUBATOR_REPO=${APP_INCUBATOR_REPO:-https://github.com/murano-project/murano-app-incubator}
APP_INCUBATOR_BRANCH=${APP_INCUBATOR_BRANCH:-'master'}
DIB_MURANO_AGENT_REPO=${DIB_MURANO_AGENT_REPO:-git://git.openstack.org/stackforge/murano-agent.git}
DIB_MURANO_AGENT_REPO=${DIB_MURANO_AGENT_REPO:-git://git.openstack.org/openstack/murano-agent.git}
DIB_MURANO_AGENT_BRANCH=${DIB_MURANO_AGENT_BRANCH:-master}
DIB_MURANO_AGENT_REF=${DIB_MURANO_AGENT_REF:-''}
@ -489,20 +489,20 @@ function deploy_devstack() {
# Assuming the script is run from 'jenkins' user
local git_dir=/opt/git
sudo mkdir -p "${git_dir}/stackforge"
sudo chown -R jenkins:jenkins "${git_dir}/stackforge"
cd "${git_dir}/stackforge"
git clone https://github.com/stackforge/murano
sudo mkdir -p "${git_dir}/openstack"
sudo chown -R jenkins:jenkins "${git_dir}/openstack"
cd "${git_dir}/openstack"
git clone https://github.com/openstack/murano
if [ "${PROJECT_NAME}" == 'murano' ]; then
pushd "${git_dir}/stackforge/murano"
pushd "${git_dir}/openstack/murano"
git fetch ${ZUUL_URL}/${ZUUL_PROJECT} ${ZUUL_REF} && git checkout FETCH_HEAD
popd
fi
# NOTE: Source path MUST ends with a slash!
rsync --recursive --keep-dirlinks --exclude README.* \
"${git_dir}/stackforge/murano/contrib/devstack/" "${STACK_HOME}/devstack/"
"${git_dir}/openstack/murano/contrib/devstack/" "${STACK_HOME}/devstack/"
cd "${STACK_HOME}/devstack"