From 371b5c978e2b0a31a6f5fc10fedc153a0cae5630 Mon Sep 17 00:00:00 2001 From: Carl Li Date: Sun, 18 Oct 2015 09:57:23 -0700 Subject: [PATCH] move stackforge to openstack Change-Id: I78d9c15f5565ba9bd9495bb2df910ff26da00544 --- .gitreview | 2 +- README.md | 6 +++--- install/install.conf.template | 4 ++-- install/install.sh | 4 ++-- install/prepare.sh | 4 ++-- misc/ci/prepare_node_compass.sh | 2 +- .../jenkins/jobs/compass-adapters-e2e/config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-daily-7vm/config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-daily-allin1/config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-demo-7vm/config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-dev-demo/config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-e2e-7vm-ubuntu/config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-e2e-7vm/config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../jobs/compass-bare-e2e-allin1-experimental/config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../jobs/compass-bare-e2e-allin1-ubuntu/config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-e2e-allin1/config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../compass-bare-e2e-multinode-experimental/config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../jobs/compass-bare-e2e-multinode-ubuntu/config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-e2e-multinode/config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../jobs/compass-bare-e2e-multinodes-allin1/config.xml | 8 ++++---- .../jobs/compass-bare-e2e-osonly-experimental/config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../jobs/compass-bare-e2e-osonly-ubuntu/config.xml | 8 ++++---- .../jenkins/jobs/compass-bare-e2e-osonly/config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../config.xml | 8 ++++---- .../compass-bare-e2e-single-controller-allin1/config.xml | 8 ++++---- .../jenkins/jobs/compass-core-coverage-xml/config.xml | 8 ++++---- .../jenkins/jobs/compass-core-coverage/config.xml | 8 ++++---- project-config/jenkins/jobs/compass-core-pep8/config.xml | 8 ++++---- project-config/jenkins/jobs/compass-core-py26/config.xml | 8 ++++---- project-config/jenkins/jobs/compass-core-py27/config.xml | 8 ++++---- project-config/jenkins/jobs/compass-demo/config.xml | 8 ++++---- .../jenkins/jobs/compass-dev-demo-7vm/config.xml | 8 ++++---- .../jenkins/jobs/compass-dev-demo-compass/config.xml | 8 ++++---- project-config/jenkins/jobs/compass-dev-demo/config.xml | 8 ++++---- .../jenkins/jobs/compass-install-e2e-aio/config.xml | 8 ++++---- .../jenkins/jobs/compass-install-e2e-mini/config.xml | 8 ++++---- .../compass-trusty-bare-e2e-allin1-ubuntu-1404/config.xml | 8 ++++---- project-config/zuul/layout.yaml | 4 ++-- regtest/ansible/ci/setup-env.sh | 2 +- regtest/ansible/ci/test.sh | 4 ++-- regtest/ansible/install/group_vars/all | 2 +- regtest/ansible/install/roles/cobbler/vars/main.yml | 2 +- regtest/ansible/install/roles/compass/tasks/RedHat.yml | 4 ++-- .../ansible/install/roles/regtest-compass/tasks/main.yml | 2 +- setup.py | 2 +- vagrant/README.md | 2 +- vagrant/first_run.sh | 2 +- 59 files changed, 196 insertions(+), 196 deletions(-) diff --git a/.gitreview b/.gitreview index 19a3a613..4bd50594 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,5 @@ [gerrit] host=review.openstack.org port=29418 -project=stackforge/compass-core.git +project=openstack/compass-core.git defaultbranch=master diff --git a/README.md b/README.md index 7f5bfd7f..66498e9e 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/install/install.conf.template b/install/install.conf.template index 6f1d9a09..d494e9e9 100755 --- a/install/install.conf.template +++ b/install/install.conf.template @@ -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 diff --git a/install/install.sh b/install/install.sh index f44a0fef..f79fc5d4 100755 --- a/install/install.sh +++ b/install/install.sh @@ -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" diff --git a/install/prepare.sh b/install/prepare.sh index 73cd5069..3d099e2b 100755 --- a/install/prepare.sh +++ b/install/prepare.sh @@ -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" diff --git a/misc/ci/prepare_node_compass.sh b/misc/ci/prepare_node_compass.sh index 890cce11..b9c40dbd 100755 --- a/misc/ci/prepare_node_compass.sh +++ b/misc/ci/prepare_node_compass.sh @@ -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 diff --git a/project-config/jenkins/jobs/compass-adapters-e2e/config.xml b/project-config/jenkins/jobs/compass-adapters-e2e/config.xml index 358d3186..76592e34 100644 --- a/project-config/jenkins/jobs/compass-adapters-e2e/config.xml +++ b/project-config/jenkins/jobs/compass-adapters-e2e/config.xml @@ -35,10 +35,10 @@ #!/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 diff --git a/project-config/jenkins/jobs/compass-bare-daily-7vm/config.xml b/project-config/jenkins/jobs/compass-bare-daily-7vm/config.xml index 758fd800..2e2d0445 100644 --- a/project-config/jenkins/jobs/compass-bare-daily-7vm/config.xml +++ b/project-config/jenkins/jobs/compass-bare-daily-7vm/config.xml @@ -26,15 +26,15 @@ #!/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 && git cherry-pick FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && 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 && git cherry-pick FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && git cherry-pick FETCH_HEAD fi cd .. fi diff --git a/project-config/jenkins/jobs/compass-bare-daily-allin1/config.xml b/project-config/jenkins/jobs/compass-bare-daily-allin1/config.xml index ecc6c4e7..503e597a 100644 --- a/project-config/jenkins/jobs/compass-bare-daily-allin1/config.xml +++ b/project-config/jenkins/jobs/compass-bare-daily-allin1/config.xml @@ -26,15 +26,15 @@ #!/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 && git cherry-pick FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && 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 && git cherry-pick FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && git cherry-pick FETCH_HEAD fi cd .. fi diff --git a/project-config/jenkins/jobs/compass-bare-demo-7vm/config.xml b/project-config/jenkins/jobs/compass-bare-demo-7vm/config.xml index ab736077..a099f5a0 100644 --- a/project-config/jenkins/jobs/compass-bare-demo-7vm/config.xml +++ b/project-config/jenkins/jobs/compass-bare-demo-7vm/config.xml @@ -26,15 +26,15 @@ #!/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 && git cherry-pick FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && 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 && git cherry-pick FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && git cherry-pick FETCH_HEAD fi cd .. fi diff --git a/project-config/jenkins/jobs/compass-bare-dev-demo/config.xml b/project-config/jenkins/jobs/compass-bare-dev-demo/config.xml index 59c45a7c..ad22aab7 100644 --- a/project-config/jenkins/jobs/compass-bare-dev-demo/config.xml +++ b/project-config/jenkins/jobs/compass-bare-dev-demo/config.xml @@ -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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-7vm-ubuntu/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-7vm-ubuntu/config.xml index 54d13a73..7cf1022d 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-7vm-ubuntu/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-7vm-ubuntu/config.xml @@ -26,10 +26,10 @@ #!/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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-7vm/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-7vm/config.xml index 91f07505..3406f19d 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-7vm/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-7vm/config.xml @@ -26,10 +26,10 @@ #!/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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-allin1-centos66-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-allin1-centos66-experimental/config.xml index d6edee8b..40921853 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-allin1-centos66-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-allin1-centos66-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-allin1-centos70-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-allin1-centos70-experimental/config.xml index dd4df030..40c4243f 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-allin1-centos70-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-allin1-centos70-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-allin1-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-allin1-experimental/config.xml index f4e0b7fe..af07857d 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-allin1-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-allin1-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu-experimental/config.xml index 2cac498b..0d36c965 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu-experimental/config.xml @@ -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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu/config.xml index 2208c672..19fee90b 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu1404-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu1404-experimental/config.xml index f75e8e67..bf99008e 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu1404-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-allin1-ubuntu1404-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-allin1/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-allin1/config.xml index f323221f..92590384 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-allin1/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-allin1/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -50,10 +50,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-allinone-ubuntu1404-ansible-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-allinone-ubuntu1404-ansible-experimental/config.xml index 1e6e6eb0..28ef2149 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-allinone-ubuntu1404-ansible-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-allinone-ubuntu1404-ansible-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-multinode-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-multinode-experimental/config.xml index efe4832c..2f977cb6 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-multinode-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-multinode-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -49,10 +49,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu-experimental/config.xml index 9be5de04..b8b966d7 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -49,10 +49,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu/config.xml index 86f37b10..dfe5226d 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-multinode-ubuntu/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-multinode/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-multinode/config.xml index 1f64cf09..93f78c84 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-multinode/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-multinode/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1-experimental/config.xml index 077fba9c..7aed6494 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1-experimental/config.xml @@ -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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1/config.xml index ad69f094..ff3f0d39 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-multinodes-allin1/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-osonly-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-osonly-experimental/config.xml index 8f3b4689..dfb29c28 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-osonly-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-osonly-experimental/config.xml @@ -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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu-experimental/config.xml index d834024f..0afd51d6 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu-experimental/config.xml @@ -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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu/config.xml index 29e19002..67c69555 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-osonly-ubuntu/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-osonly/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-osonly/config.xml index 7037ad3e..2b51006b 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-osonly/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-osonly/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-experimental/config.xml index 4ec4a766..7ec4776c 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu-experimental/config.xml index 5887f2b4..4d350c37 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu/config.xml index 5ac57544..489b04db 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute-ubuntu/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute/config.xml index 44187c75..c8128ca0 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-single-contoller-multi-compute/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1-experimental/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1-experimental/config.xml index 22d24f53..db12cdf5 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1-experimental/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1-experimental/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1/config.xml b/project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1/config.xml index 8178855c..78606356 100644 --- a/project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1/config.xml +++ b/project-config/jenkins/jobs/compass-bare-e2e-single-controller-allin1/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-core-coverage-xml/config.xml b/project-config/jenkins/jobs/compass-core-coverage-xml/config.xml index e65d9d11..646186e5 100644 --- a/project-config/jenkins/jobs/compass-core-coverage-xml/config.xml +++ b/project-config/jenkins/jobs/compass-core-coverage-xml/config.xml @@ -26,18 +26,18 @@ #!/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 && git checkout FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && 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 && git checkout FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && git checkout FETCH_HEAD git clean -x -f -d -q fi tox -ereport diff --git a/project-config/jenkins/jobs/compass-core-coverage/config.xml b/project-config/jenkins/jobs/compass-core-coverage/config.xml index e3638326..f8f234b2 100644 --- a/project-config/jenkins/jobs/compass-core-coverage/config.xml +++ b/project-config/jenkins/jobs/compass-core-coverage/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -49,10 +49,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 diff --git a/project-config/jenkins/jobs/compass-core-pep8/config.xml b/project-config/jenkins/jobs/compass-core-pep8/config.xml index 09bc1946..df94fed7 100644 --- a/project-config/jenkins/jobs/compass-core-pep8/config.xml +++ b/project-config/jenkins/jobs/compass-core-pep8/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-core-py26/config.xml b/project-config/jenkins/jobs/compass-core-py26/config.xml index bcae6607..a7674e69 100644 --- a/project-config/jenkins/jobs/compass-core-py26/config.xml +++ b/project-config/jenkins/jobs/compass-core-py26/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-core-py27/config.xml b/project-config/jenkins/jobs/compass-core-py27/config.xml index b3574786..58b746c9 100644 --- a/project-config/jenkins/jobs/compass-core-py27/config.xml +++ b/project-config/jenkins/jobs/compass-core-py27/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-demo/config.xml b/project-config/jenkins/jobs/compass-demo/config.xml index 818f0902..c3d6c144 100644 --- a/project-config/jenkins/jobs/compass-demo/config.xml +++ b/project-config/jenkins/jobs/compass-demo/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-dev-demo-7vm/config.xml b/project-config/jenkins/jobs/compass-dev-demo-7vm/config.xml index b406597d..67ad5106 100644 --- a/project-config/jenkins/jobs/compass-dev-demo-7vm/config.xml +++ b/project-config/jenkins/jobs/compass-dev-demo-7vm/config.xml @@ -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 diff --git a/project-config/jenkins/jobs/compass-dev-demo-compass/config.xml b/project-config/jenkins/jobs/compass-dev-demo-compass/config.xml index fe560121..34e639ee 100644 --- a/project-config/jenkins/jobs/compass-dev-demo-compass/config.xml +++ b/project-config/jenkins/jobs/compass-dev-demo-compass/config.xml @@ -26,10 +26,10 @@ #!/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 diff --git a/project-config/jenkins/jobs/compass-dev-demo/config.xml b/project-config/jenkins/jobs/compass-dev-demo/config.xml index 976167ae..2795b2d7 100644 --- a/project-config/jenkins/jobs/compass-dev-demo/config.xml +++ b/project-config/jenkins/jobs/compass-dev-demo/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/jenkins/jobs/compass-install-e2e-aio/config.xml b/project-config/jenkins/jobs/compass-install-e2e-aio/config.xml index dca1b905..41ba4e00 100644 --- a/project-config/jenkins/jobs/compass-install-e2e-aio/config.xml +++ b/project-config/jenkins/jobs/compass-install-e2e-aio/config.xml @@ -26,15 +26,15 @@ #!/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 && git cherry-pick FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && 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 && git cherry-pick FETCH_HEAD + git fetch https://review.openstack.org/openstack/compass-core $GERRIT_REFSPEC && git cherry-pick FETCH_HEAD fi cd .. fi diff --git a/project-config/jenkins/jobs/compass-install-e2e-mini/config.xml b/project-config/jenkins/jobs/compass-install-e2e-mini/config.xml index 79f17054..7f5367b6 100644 --- a/project-config/jenkins/jobs/compass-install-e2e-mini/config.xml +++ b/project-config/jenkins/jobs/compass-install-e2e-mini/config.xml @@ -35,10 +35,10 @@ #!/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 diff --git a/project-config/jenkins/jobs/compass-trusty-bare-e2e-allin1-ubuntu-1404/config.xml b/project-config/jenkins/jobs/compass-trusty-bare-e2e-allin1-ubuntu-1404/config.xml index 3f3bbebb..dbaf19b3 100644 --- a/project-config/jenkins/jobs/compass-trusty-bare-e2e-allin1-ubuntu-1404/config.xml +++ b/project-config/jenkins/jobs/compass-trusty-bare-e2e-allin1-ubuntu-1404/config.xml @@ -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 "ZUUL_PROJECT is not set" @@ -45,10 +45,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 diff --git a/project-config/zuul/layout.yaml b/project-config/zuul/layout.yaml index b811069c..86b17833 100644 --- a/project-config/zuul/layout.yaml +++ b/project-config/zuul/layout.yaml @@ -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 diff --git a/regtest/ansible/ci/setup-env.sh b/regtest/ansible/ci/setup-env.sh index 61e9263b..d93737bb 100644 --- a/regtest/ansible/ci/setup-env.sh +++ b/regtest/ansible/ci/setup-env.sh @@ -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 "$*"; } diff --git a/regtest/ansible/ci/test.sh b/regtest/ansible/ci/test.sh index 403ac1cd..91614040 100644 --- a/regtest/ansible/ci/test.sh +++ b/regtest/ansible/ci/test.sh @@ -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 diff --git a/regtest/ansible/install/group_vars/all b/regtest/ansible/install/group_vars/all index 67631c02..33d6da93 100644 --- a/regtest/ansible/install/group_vars/all +++ b/regtest/ansible/install/group_vars/all @@ -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 diff --git a/regtest/ansible/install/roles/cobbler/vars/main.yml b/regtest/ansible/install/roles/cobbler/vars/main.yml index d25e1342..c9bc4ff2 100644 --- a/regtest/ansible/install/roles/cobbler/vars/main.yml +++ b/regtest/ansible/install/roles/cobbler/vars/main.yml @@ -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/ diff --git a/regtest/ansible/install/roles/compass/tasks/RedHat.yml b/regtest/ansible/install/roles/compass/tasks/RedHat.yml index e0b9b644..8e40e868 100644 --- a/regtest/ansible/install/roles/compass/tasks/RedHat.yml +++ b/regtest/ansible/install/roles/compass/tasks/RedHat.yml @@ -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 diff --git a/regtest/ansible/install/roles/regtest-compass/tasks/main.yml b/regtest/ansible/install/roles/regtest-compass/tasks/main.yml index f5812e85..90dc9dcd 100644 --- a/regtest/ansible/install/roles/regtest-compass/tasks/main.yml +++ b/regtest/ansible/install/roles/regtest-compass/tasks/main.yml @@ -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 diff --git a/setup.py b/setup.py index 67ae473d..b0b221a9 100644 --- a/setup.py +++ b/setup.py @@ -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 diff --git a/vagrant/README.md b/vagrant/README.md index ee328bee..5446a7a8 100644 --- a/vagrant/README.md +++ b/vagrant/README.md @@ -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 }}``` diff --git a/vagrant/first_run.sh b/vagrant/first_run.sh index 458b196c..0d5a59bd 100755 --- a/vagrant/first_run.sh +++ b/vagrant/first_run.sh @@ -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