x
/
compass-core
Code Issues Proposed changes

move stackforge to openstack 

Change-Id: I78d9c15f5565ba9bd9495bb2df910ff26da00544
This commit is contained in:
Carl Li 2015-10-18 09:57:23 -07:00
parent 138f045411
commit 371b5c978e
59 changed files with 196 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -1,5 +1,5 @@
[gerrit]
host=review.openstack.org
port=29418
project=stackforge/compass-core.git
project=openstack/compass-core.git
defaultbranch=master

6
README.md
View File

@ -32,7 +32,7 @@ _Note: the above assumes you use virtualenvwrapper to manage your virtualenv_
**1. Checkout source**
(compass-core-env)$git checkout https://github.com/stackforge/compass-core.git
(compass-core-env)$git checkout https://github.com/openstack/compass-core.git
**2. Run the tests making sure you are working on a clean and working code base** (i.e., did someone else break the code)
@ -104,7 +104,7 @@ Quick Guide to Users
### Install Compass from source?
1. Run `git clone -b dev/exeperimental git://git.openstack.org/stackforge/compass-core.git`
1. Run `git clone -b dev/exeperimental git://git.openstack.org/openstack/compass-core.git`
2. Run `cd compass` to the Compass project directory.
3. Run `./install/install.sh` to setup compass environment. Please note that before you execute `install.sh`, you may setup your environment variables in `install/install.conf`, explanations and examples of those variables can be found in `install.conf`.
4. Run `./bin/refresh.sh` to initialize database.
@ -117,7 +117,7 @@ Quick Guide to Users
2. Make sure your OS and CPU architecture are both 64-bit.
3. Make sure you have virtualbox installed.
4. Make sure you have virtualbox extension pack installed to support pxe.
5. Run `git clone -b dev/experimental git://git.openstack.org/stackforge/compass-core.git`
5. Run `git clone -b dev/experimental git://git.openstack.org/openstack/compass-core.git`
6. Go to directory `compass-core/vagrant`
7. Run `./launch.sh`
Note: all the vboxnet interfaces and compass related vms should be removed prior to another launch.

4
install/install.conf.template
View File

@ -42,8 +42,8 @@ export NAMESERVER_DOMAINS=ods.com
export NAMESERVER_REVERSE_ZONES=unused
# the repo url
export WEB_SOURCE='http://git.openstack.org/stackforge'/compass-web
export ADAPTERS_SOURCE='http://git.openstack.org/stackforge/compass-adapters'
export WEB_SOURCE='http://git.openstack.org/openstack'/compass-web
export ADAPTERS_SOURCE='http://git.openstack.org/openstack/compass-adapters'
# set the default cobbler user "cobbler" password, if not set, the default will be cobbler/cobbler
export CBLR_USER=cobbler
export CBLR_PASSWD=cobbler

4
install/install.sh
View File

@ -326,8 +326,8 @@ fi
loadvars NAMESERVER_DOMAINS "ods.com"
loadvars NAMESERVER_REVERSE_ZONES "unused"
loadvars WEB_SOURCE 'http://git.openstack.org/stackforge/compass-web'
loadvars ADAPTERS_SOURCE 'http://git.openstack.org/stackforge/compass-adapters'
loadvars WEB_SOURCE 'http://git.openstack.org/openstack/compass-web'
loadvars ADAPTERS_SOURCE 'http://git.openstack.org/openstack/compass-adapters'
echo "script dir: $SCRIPT_DIR"
echo "compass dir is $COMPASSDIR"

4
install/prepare.sh
View File

@ -165,13 +165,13 @@ if [ -z $WEB_SOURCE ]; then
echo "web source $WEB_SOURCE is not set"
exit 1
fi
copy2dir "$WEB_SOURCE" "$WEB_HOME" "stackforge/compass-web" || exit $?
copy2dir "$WEB_SOURCE" "$WEB_HOME" "openstack/compass-web" || exit $?
if [ -z $ADAPTERS_SOURCE ]; then
echo "adpaters source $ADAPTERS_SOURCE is not set"
exit 1
fi
copy2dir "$ADAPTERS_SOURCE" "$ADAPTERS_HOME" "stackforge/compass-adapters" ${local_branch} || exit $?
copy2dir "$ADAPTERS_SOURCE" "$ADAPTERS_HOME" "openstack/compass-adapters" ${local_branch} || exit $?
if [ "$tempest" == "true" ]; then
echo "download tempest packages"

2
misc/ci/prepare_node_compass.sh
View File

@ -16,7 +16,7 @@ else
dhclient -r installation
dhclient installation
fi
git clone http://git.openstack.org/stackforge/compass-core -b dev/experimental ||exit $?
git clone http://git.openstack.org/openstack/compass-core -b dev/experimental ||exit $?
cd compass-core
source install/install.conf.template
source install/install.conf

8
project-config/jenkins/jobs/compass-adapters-e2e/config.xml
View File

@ -35,10 +35,10 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone https://git.openstack.org/stackforge/compass-core
git clone https://git.openstack.org/openstack/compass-core
else
cd compass-core
git remote set-url origin https://git.openstack.org/stackforge/compass-core
git remote set-url origin https://git.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -50,11 +50,11 @@ fi
cd compass-core
if [[ ! -z $ZUUL_REF || ! -z $GERRIT_REFSPEC ]]; then
if [[ ! -z $ZUUL_REF ]]; then
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
elif [[ ! -z $GERRIT_REFSPEC ]]; then
git_repo=https://$GERRIT_HOST/stackforge/compass-core
git_repo=https://$GERRIT_HOST/openstack/compass-core
git_ref=$GERRIT_REFSPEC
git_branch=$GERRIT_BRANCH
fi

8
project-config/jenkins/jobs/compass-bare-daily-7vm/config.xml
View File

@ -26,15 +26,15 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone http://git.openstack.org/stackforge/compass-core
git clone http://git.openstack.org/openstack/compass-core
cd compass-core
if [[ ! -z $GERRIT_REFSPEC ]]; then
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
cd ..
fi
else
cd compass-core
git remote set-url origin https://review.openstack.org/stackforge/compass-core
git remote set-url origin https://review.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -42,7 +42,7 @@ else
git reset --hard remotes/origin/master
git clean -x -f -d -q
if [[ ! -z $GERRIT_REFSPEC ]]; then
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
fi
cd ..
fi</command>

8
project-config/jenkins/jobs/compass-bare-daily-allin1/config.xml
View File

@ -26,15 +26,15 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone http://git.openstack.org/stackforge/compass-core
git clone http://git.openstack.org/openstack/compass-core
cd compass-core
if [[ ! -z $GERRIT_REFSPEC ]]; then
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
cd ..
fi
else
cd compass-core
git remote set-url origin https://review.openstack.org/stackforge/compass-core
git remote set-url origin https://review.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -42,7 +42,7 @@ else
git reset --hard remotes/origin/master
git clean -x -f -d -q
if [[ ! -z $GERRIT_REFSPEC ]]; then
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
fi
cd ..
fi</command>

8
project-config/jenkins/jobs/compass-bare-demo-7vm/config.xml
View File

@ -26,15 +26,15 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone http://git.openstack.org/stackforge/compass-core
git clone http://git.openstack.org/openstack/compass-core
cd compass-core
if [[ ! -z $GERRIT_REFSPEC ]]; then
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
cd ..
fi
else
cd compass-core
git remote set-url origin https://review.openstack.org/stackforge/compass-core
git remote set-url origin https://review.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -42,7 +42,7 @@ else
git reset --hard remotes/origin/master
git clean -x -f -d -q
if [[ ! -z $GERRIT_REFSPEC ]]; then
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
fi
cd ..
fi</command>

8
project-config/jenkins/jobs/compass-bare-dev-demo/config.xml
View File

@ -38,10 +38,10 @@ if [[ -e compass-core ]]; then
rm -rf compass-core
fi
if [[ ! -e compass-core ]]; then
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
else
cd compass-core
git remote set-url origin https://git.openstack.org/stackforge/compass-core
git remote set-url origin https://git.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -53,11 +53,11 @@ fi
cd compass-core
if [[ ! -z $ZUUL_REF || ! -z $GERRIT_REFSPEC ]]; then
if [[ ! -z $ZUUL_REF ]]; then
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
elif [[ ! -z $GERRIT_REFSPEC ]]; then
git_repo=https://$GERRIT_HOST/stackforge/compass-core
git_repo=https://$GERRIT_HOST/openstack/compass-core
git_ref=$GERRIT_REFSPEC
git_branch=$GERRIT_BRANCH
fi

8
project-config/jenkins/jobs/compass-bare-e2e-7vm-ubuntu/config.xml
View File

@ -26,10 +26,10 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone https://git.openstack.org/stackforge/compass-core
git clone https://git.openstack.org/openstack/compass-core
else
cd compass-core
git remote set-url origin https://git.openstack.org/stackforge/compass-core
git remote set-url origin https://git.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -41,11 +41,11 @@ fi
cd compass-core
if [[ ! -z $ZUUL_REF || ! -z $GERRIT_REFSPEC ]]; then
if [[ ! -z $ZUUL_REF ]]; then
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
elif [[ ! -z $GERRIT_REFSPEC ]]; then
git_repo=https://$GERRIT_HOST/stackforge/compass-core
git_repo=https://$GERRIT_HOST/openstack/compass-core
git_ref=$GERRIT_REFSPEC
git_branch=$GERRIT_BRANCH
fi

8
project-config/jenkins/jobs/compass-bare-e2e-7vm/config.xml
View File

@ -26,10 +26,10 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone https://git.openstack.org/stackforge/compass-core
git clone https://git.openstack.org/openstack/compass-core
else
cd compass-core
git remote set-url origin https://git.openstack.org/stackforge/compass-core
git remote set-url origin https://git.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -41,11 +41,11 @@ fi
cd compass-core
if [[ ! -z $ZUUL_REF || ! -z $GERRIT_REFSPEC ]]; then
if [[ ! -z $ZUUL_REF ]]; then
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
elif [[ ! -z $GERRIT_REFSPEC ]]; then
git_repo=https://$GERRIT_HOST/stackforge/compass-core
git_repo=https://$GERRIT_HOST/openstack/compass-core
git_ref=$GERRIT_REFSPEC
git_branch=$GERRIT_BRANCH
fi

8
project-config/jenkins/jobs/compass-bare-e2e-allin1-centos66-experimental/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-allin1-centos70-experimental/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-allin1-experimental/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu-experimental/config.xml
View File

@ -36,7 +36,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo "ZUUL_PROJECT is not set"
@ -44,10 +44,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo "ZUUL_BRANCH is not set"
elif [[ -z $ZUUL_REF ]]; then
echo "ZUUL_REF is not set"
elif [[ "$ZUUL_PROJECT" != "stackforge/compass-core" ]]; then
echo "$ZUUL_PROJECT is not stackforge/compass-core"
elif [[ "$ZUUL_PROJECT" != "openstack/compass-core" ]]; then
echo "$ZUUL_PROJECT is not openstack/compass-core"
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu1404-experimental/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-allin1/config.xml
View File

@ -42,7 +42,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -50,10 +50,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-allinone-ubuntu1404-ansible-experimental/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-multinode-experimental/config.xml
View File

@ -41,7 +41,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -49,10 +49,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu-experimental/config.xml
View File

@ -41,7 +41,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -49,10 +49,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-multinode/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1-experimental/config.xml
View File

@ -36,7 +36,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo "ZUUL_PROJECT is not set"
@ -44,10 +44,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo "ZUUL_BRANCH is not set"
elif [[ -z $ZUUL_REF ]]; then
echo "ZUUL_REF is not set"
elif [[ "$ZUUL_PROJECT" != "stackforge/compass-core" ]]; then
echo "$ZUUL_PROJECT is not stackforge/compass-core"
elif [[ "$ZUUL_PROJECT" != "openstack/compass-core" ]]; then
echo "$ZUUL_PROJECT is not openstack/compass-core"
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-osonly-experimental/config.xml
View File

@ -36,7 +36,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo "ZUUL_PROJECT is not set"
@ -44,10 +44,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo "ZUUL_BRANCH is not set"
elif [[ -z $ZUUL_REF ]]; then
echo "ZUUL_REF is not set"
elif [[ "$ZUUL_PROJECT" != "stackforge/compass-core" ]]; then
echo "$ZUUL_PROJECT is not stackforge/compass-core"
elif [[ "$ZUUL_PROJECT" != "openstack/compass-core" ]]; then
echo "$ZUUL_PROJECT is not openstack/compass-core"
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu-experimental/config.xml
View File

@ -36,7 +36,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo "ZUUL_PROJECT is not set"
@ -44,10 +44,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo "ZUUL_BRANCH is not set"
elif [[ -z $ZUUL_REF ]]; then
echo "ZUUL_REF is not set"
elif [[ "$ZUUL_PROJECT" != "stackforge/compass-core" ]]; then
echo "$ZUUL_PROJECT is not stackforge/compass-core"
elif [[ "$ZUUL_PROJECT" != "openstack/compass-core" ]]; then
echo "$ZUUL_PROJECT is not openstack/compass-core"
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-osonly/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-experimental/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu-experimental/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1-experimental/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-core-coverage-xml/config.xml
View File

@ -26,18 +26,18 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -xe
if [[ ! -e compass-core ]]; then
git clone http://git.openstack.org/stackforge/compass-core
git clone http://git.openstack.org/openstack/compass-core
cd compass-core
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git checkout FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git checkout FETCH_HEAD
else
cd compass-core
git remote set-url origin https://review.openstack.org/stackforge/compass-core
git remote set-url origin https://review.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
git checkout master
git reset --hard remotes/origin/master
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git checkout FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git checkout FETCH_HEAD
git clean -x -f -d -q
fi
tox -ereport</command>

8
project-config/jenkins/jobs/compass-core-coverage/config.xml
View File

@ -41,7 +41,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -49,10 +49,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-core-pep8/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-core-py26/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-core-py27/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-demo/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-dev-demo-7vm/config.xml
View File

@ -29,10 +29,10 @@ export GERRIT_REFSPEC=refs/changes/51/112751/6
export GERRIT_BRANCH=master
export GERRIT_HOST=review.openstack.org
if [[ ! -e compass-core ]]; then
git clone https://git.openstack.org/stackforge/compass-core
git clone https://git.openstack.org/openstack/compass-core
else
cd compass-core
git remote set-url origin https://git.openstack.org/stackforge/compass-core
git remote set-url origin https://git.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -44,11 +44,11 @@ fi
cd compass-core
if [[ ! -z $ZUUL_REF || ! -z $GERRIT_REFSPEC ]]; then
if [[ ! -z $ZUUL_REF ]]; then
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
elif [[ ! -z $GERRIT_REFSPEC ]]; then
git_repo=https://$GERRIT_HOST/stackforge/compass-core
git_repo=https://$GERRIT_HOST/openstack/compass-core
git_ref=$GERRIT_REFSPEC
git_branch=$GERRIT_BRANCH
fi

8
project-config/jenkins/jobs/compass-dev-demo-compass/config.xml
View File

@ -26,10 +26,10 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone https://git.openstack.org/stackforge/compass-core
git clone https://git.openstack.org/openstack/compass-core
else
cd compass-core
git remote set-url origin https://git.openstack.org/stackforge/compass-core
git remote set-url origin https://git.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -41,11 +41,11 @@ fi
cd compass-core
if [[ ! -z $ZUUL_REF || ! -z $GERRIT_REFSPEC ]]; then
if [[ ! -z $ZUUL_REF ]]; then
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
elif [[ ! -z $GERRIT_REFSPEC ]]; then
git_repo=https://$GERRIT_HOST/stackforge/compass-core
git_repo=https://$GERRIT_HOST/openstack/compass-core
git_ref=$GERRIT_REFSPEC
git_branch=$GERRIT_BRANCH
fi

8
project-config/jenkins/jobs/compass-dev-demo/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

8
project-config/jenkins/jobs/compass-install-e2e-aio/config.xml
View File

@ -26,15 +26,15 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone http://git.openstack.org/stackforge/compass-core
git clone http://git.openstack.org/openstack/compass-core
cd compass-core
if [[ ! -z $GERRIT_REFSPEC ]]; then
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
cd ..
fi
else
cd compass-core
git remote set-url origin https://review.openstack.org/stackforge/compass-core
git remote set-url origin https://review.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -42,7 +42,7 @@ else
git reset --hard remotes/origin/master
git clean -x -f -d -q
if [[ ! -z $GERRIT_REFSPEC ]]; then
git fetch https://review.openstack.org/stackforge/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC &amp;&amp; git cherry-pick FETCH_HEAD
fi
cd ..
fi</command>

8
project-config/jenkins/jobs/compass-install-e2e-mini/config.xml
View File

@ -35,10 +35,10 @@
<hudson.tasks.Shell>
<command>#!/bin/bash -x
if [[ ! -e compass-core ]]; then
git clone https://git.openstack.org/stackforge/compass-core
git clone https://git.openstack.org/openstack/compass-core
else
cd compass-core
git remote set-url origin https://git.openstack.org/stackforge/compass-core
git remote set-url origin https://git.openstack.org/openstack/compass-core
git remote update
git reset --hard
git clean -x -f -d -q
@ -50,11 +50,11 @@ fi
cd compass-core
if [[ ! -z $ZUUL_REF || ! -z $GERRIT_REFSPEC ]]; then
if [[ ! -z $ZUUL_REF ]]; then
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
elif [[ ! -z $GERRIT_REFSPEC ]]; then
git_repo=https://$GERRIT_HOST/stackforge/compass-core
git_repo=https://$GERRIT_HOST/openstack/compass-core
git_ref=$GERRIT_REFSPEC
git_branch=$GERRIT_BRANCH
fi

8
project-config/jenkins/jobs/compass-trusty-bare-e2e-allin1-ubuntu-1404/config.xml
View File

@ -37,7 +37,7 @@
if [[ -e compass-core ]]; then
rm -rf compass-core
fi
git clone https://git.openstack.org/stackforge/compass-core -b $ZUUL_BRANCH
git clone https://git.openstack.org/openstack/compass-core -b $ZUUL_BRANCH
cd compass-core
if [[ -z $ZUUL_PROJECT ]]; then
echo &quot;ZUUL_PROJECT is not set&quot;
@ -45,10 +45,10 @@ elif [[ -z $ZUUL_BRANCH ]]; then
echo &quot;ZUUL_BRANCH is not set&quot;
elif [[ -z $ZUUL_REF ]]; then
echo &quot;ZUUL_REF is not set&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;stackforge/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not stackforge/compass-core&quot;
elif [[ &quot;$ZUUL_PROJECT&quot; != &quot;openstack/compass-core&quot; ]]; then
echo &quot;$ZUUL_PROJECT is not openstack/compass-core&quot;
else
git_repo=$ZUUL_URL/stackforge/compass-core
git_repo=$ZUUL_URL/openstack/compass-core
git_ref=$ZUUL_REF
git_branch=$ZUUL_BRANCH
git reset --hard remotes/origin/$git_branch

4
project-config/zuul/layout.yaml
View File

@ -99,7 +99,7 @@ jobs:
voting: false
projects:
- name: stackforge/compass-core
- name: openstack/compass-core
check:
- compass-demo
- compass-bare-e2e-allin1
@ -109,7 +109,7 @@ projects:
- compass-bare-e2e-allin1-ubuntu
- compass-bare-e2e-single-contoller-multi-compute-ubuntu
- name: stackforge/compass-adapters
- name: openstack/compass-adapters
check:
- compass-demo
- compass-bare-e2e-allin1

2
regtest/ansible/ci/setup-env.sh
View File

@ -1,5 +1,5 @@
#rm -rf compass-install
#git clone http://git.openstack.org/stackforge/compass-install
#git clone http://git.openstack.org/openstack/compass-install
#cd compass-install
function join { local IFS="$1"; shift; echo "$*"; }

4
regtest/ansible/ci/test.sh
View File

@ -18,7 +18,7 @@ mv ${centos65_box_vb_filename} centos65.box
vagrant mutate precise64.box libvirt
vagrant mutate centos65.box libvirt
sudo pip install ansible
git clone http://git.openstack.org/stackforge/compass-install
git clone http://git.openstack.org/openstack/compass-install
cd compass-install
function join { local IFS="$1"; shift; echo "$*"; }
@ -82,7 +82,7 @@ if [[ -n $mac_array ]]
fi
rm -rf compass-core
git clone http://git.openstack.org/stackforge/compass-core -b dev/experimental
git clone http://git.openstack.org/openstack/compass-core -b dev/experimental
cd compass-core
virtualenv venv
source venv/bin/activate

2
regtest/ansible/install/group_vars/all
View File

@ -28,7 +28,7 @@ pkg_installer: ['ansible']
epel_6: "https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"
# compass adapters
compass_adapters: "git://git.openstack.org/stackforge/compass-adapters.git"
compass_adapters: "git://git.openstack.org/openstack/compass-adapters.git"
## cobbler
# cidr for docker bridge: compass0

2
regtest/ansible/install/roles/cobbler/vars/main.yml
View File

@ -1,5 +1,5 @@
#dockerized: True
compass_adapter_source: http://git.openstack.org/stackforge/compass-adapters
compass_adapter_source: http://git.openstack.org/openstack/compass-adapters
compass_adapter_version: dev/experimental
epel_file_name: epel-release-6-8.noarch.rpm
epel_base_url: http://download.fedoraproject.org/pub/epel/6/x86_64/

4
regtest/ansible/install/roles/compass/tasks/RedHat.yml
View File

@ -82,7 +82,7 @@
pip: name=virtualenv
- name: cloning compass-core
git: repo=http://git.openstack.org/stackforge/compass-core.git
git: repo=http://git.openstack.org/openstack/compass-core.git
dest={{ COMPASS_PATH }}
version=dev/experimental
force=yes
@ -212,7 +212,7 @@
restart http service
- name: clone compass web
git: repo=http://git.openstack.org/stackforge/compass-web.git
git: repo=http://git.openstack.org/openstack/compass-web.git
dest=/opt/compass-web
force=yes

2
regtest/ansible/install/roles/regtest-compass/tasks/main.yml
View File

@ -15,7 +15,7 @@
pip: name=virtualenv
- name: cloning compass-core
git: repo=http://git.openstack.org/stackforge/compass-core.git
git: repo=http://git.openstack.org/openstack/compass-core.git
dest={{ COMPASS_PATH }}
version=dev/experimental

2
setup.py
View File

@ -72,7 +72,7 @@ setup(
system deployment on baremetal""",
author='Compass Development Group',
author_email='dev@syscompass.org',
url='https://github.com/stackforge/compass-core',
url='https://github.com/openstack/compass-core',
download_url='',
# dependency

2
vagrant/README.md
View File

@ -58,7 +58,7 @@ Currently customized service credentials are not supported(will be soon). Defaul
### Ansible code
* All ansible-related code on github: [https://github.com/stackforge/compass-adatpers](https://github.com/stackforge/compass-adapters).
* All ansible-related code on github: [https://github.com/openstack/compass-adatpers](https://github.com/openstack/compass-adapters).
* On the Compass virtualbox, to access ansible playbooks, go to ```/var/ansible/openstack_juno```. To check/modify the ansible code on any existing environment, go to ```/var/ansible/run/{{ cluster_name }}```

2
vagrant/first_run.sh
View File

@ -47,7 +47,7 @@ VBoxManage storageattach storage --storagectl "storage-IDE" --port 0 --device 0
# compass
# get latest ansible code
cd $SCRIPT_DIR
git clone -b dev/experimental git://git.openstack.org/stackforge/compass-adapters.git
git clone -b dev/experimental git://git.openstack.org/openstack/compass-adapters.git
cp -r compass-adapters/ansible/openstack_juno compass-adapters/ansible/openstack_juno_plumgrid
vagrant box list |grep compass
if [ "$?" != "0" ]; then