Handle openstack-ci to openstack-infra move.
And zuul move. Change-Id: I9819e9310943ea75b5fa8d325a49fdba97ba6752
This commit is contained in:
parent
610a56430e
commit
91338cc4f4
|
@ -1,4 +1,4 @@
|
||||||
[gerrit]
|
[gerrit]
|
||||||
host=review.openstack.org
|
host=review.openstack.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack-ci/devstack-gate.git
|
project=openstack-infra/devstack-gate.git
|
||||||
|
|
|
@ -69,7 +69,7 @@ devstack, and then runs the devstack-vm-update-image.py script. It
|
||||||
boots a new VM from the provider's base image, installs some basic
|
boots a new VM from the provider's base image, installs some basic
|
||||||
packages (build-essential, python-dev, etc) including java so that the
|
packages (build-essential, python-dev, etc) including java so that the
|
||||||
machine can run the Jenkins slave agent, runs puppet to set up the
|
machine can run the Jenkins slave agent, runs puppet to set up the
|
||||||
basic system configuration for Jenkins slaves in the openstack-ci
|
basic system configuration for Jenkins slaves in the openstack-infra
|
||||||
project, and then caches all of the debian and pip packages and test
|
project, and then caches all of the debian and pip packages and test
|
||||||
images specified in the devstack repository, and clones the OpenStack
|
images specified in the devstack repository, and clones the OpenStack
|
||||||
project repositories. It then takes a snapshot image of that machine
|
project repositories. It then takes a snapshot image of that machine
|
||||||
|
@ -198,8 +198,8 @@ managed in source code repositories just like the code of OpenStack
|
||||||
itself. If you'd like to contribute, just clone and propose a patch to
|
itself. If you'd like to contribute, just clone and propose a patch to
|
||||||
the relevant repository:
|
the relevant repository:
|
||||||
|
|
||||||
https://github.com/openstack-ci/devstack-gate
|
https://github.com/openstack-infra/devstack-gate
|
||||||
https://github.com/openstack/openstack-ci-puppet
|
https://github.com/openstack/openstack-infra-puppet
|
||||||
|
|
||||||
You can file bugs on the openstack-ci project:
|
You can file bugs on the openstack-ci project:
|
||||||
|
|
||||||
|
@ -222,7 +222,7 @@ you're working as is called "jenkins"):
|
||||||
export ZUUL_PROJECT=testing
|
export ZUUL_PROJECT=testing
|
||||||
|
|
||||||
cd /home/jenkins/workspace
|
cd /home/jenkins/workspace
|
||||||
git clone https://github.com/openstack-ci/devstack-gate
|
git clone https://github.com/openstack-infra/devstack-gate
|
||||||
cd devstack-gate
|
cd devstack-gate
|
||||||
python vmdatabase.py
|
python vmdatabase.py
|
||||||
sqlite3 /home/jenkins/vm.db
|
sqlite3 /home/jenkins/vm.db
|
||||||
|
|
|
@ -56,7 +56,7 @@ export DEVSTACK_GATE_TEMPEST_FULL=${DEVSTACK_GATE_TEMPEST_FULL:-0}
|
||||||
# Normally not set, and we do include devstack-gate with the rest of
|
# Normally not set, and we do include devstack-gate with the rest of
|
||||||
# the projects.
|
# the projects.
|
||||||
if [ -z "$SKIP_DEVSTACK_GATE_PROJECT" ]; then
|
if [ -z "$SKIP_DEVSTACK_GATE_PROJECT" ]; then
|
||||||
PROJECTS="openstack-ci/devstack-gate $PROJECTS"
|
PROJECTS="openstack-infra/devstack-gate $PROJECTS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export BASE=/opt/stack
|
export BASE=/opt/stack
|
||||||
|
@ -111,7 +111,7 @@ function setup_workspace {
|
||||||
SHORT_PROJECT=`basename $PROJECT`
|
SHORT_PROJECT=`basename $PROJECT`
|
||||||
if [[ ! -e $SHORT_PROJECT ]]; then
|
if [[ ! -e $SHORT_PROJECT ]]; then
|
||||||
echo " Need to clone $SHORT_PROJECT"
|
echo " Need to clone $SHORT_PROJECT"
|
||||||
git clone https://review.openstack.org/p/$PROJECT
|
git clone http://zuul.openstack.org/p/$PROJECT
|
||||||
fi
|
fi
|
||||||
cd $SHORT_PROJECT
|
cd $SHORT_PROJECT
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ function setup_workspace {
|
||||||
|
|
||||||
# See if Zuul prepared a ref for this project
|
# See if Zuul prepared a ref for this project
|
||||||
if [ "$ZUUL_REF" != "" ] && \
|
if [ "$ZUUL_REF" != "" ] && \
|
||||||
git fetch https://review.openstack.org/p/$PROJECT $ZUUL_REF; then
|
git fetch http://zuul.openstack.org/p/$PROJECT $ZUUL_REF; then
|
||||||
# It's there, so check it out.
|
# It's there, so check it out.
|
||||||
git checkout FETCH_HEAD
|
git checkout FETCH_HEAD
|
||||||
git reset --hard FETCH_HEAD
|
git reset --hard FETCH_HEAD
|
||||||
|
@ -283,7 +283,7 @@ GATE_SCRIPT_DIR=$BASE/new/devstack-gate
|
||||||
|
|
||||||
# Also, if we're testing devstack-gate, re-exec this script once so
|
# Also, if we're testing devstack-gate, re-exec this script once so
|
||||||
# that we can test the new version of it.
|
# that we can test the new version of it.
|
||||||
if [[ $ZUUL_PROJECT == "openstack-ci/devstack-gate" ]] && [[ $RE_EXEC != "true" ]]; then
|
if [[ $ZUUL_PROJECT == "openstack-infra/devstack-gate" ]] && [[ $RE_EXEC != "true" ]]; then
|
||||||
export RE_EXEC="true"
|
export RE_EXEC="true"
|
||||||
echo "This build includes a change to the devstack gate; re-execing this script."
|
echo "This build includes a change to the devstack gate; re-execing this script."
|
||||||
exec $GATE_SCRIPT_DIR/devstack-vm-gate-wrap.sh
|
exec $GATE_SCRIPT_DIR/devstack-vm-gate-wrap.sh
|
||||||
|
|
|
@ -60,7 +60,7 @@ PROJECTS = ['openstack/nova',
|
||||||
'openstack/python-openstackclient',
|
'openstack/python-openstackclient',
|
||||||
'openstack/python-quantumclient',
|
'openstack/python-quantumclient',
|
||||||
'openstack-dev/devstack',
|
'openstack-dev/devstack',
|
||||||
'openstack-ci/devstack-gate']
|
'openstack-infra/devstack-gate']
|
||||||
|
|
||||||
|
|
||||||
def run_local(cmd, status=False, cwd='.', env={}):
|
def run_local(cmd, status=False, cwd='.', env={}):
|
||||||
|
@ -166,8 +166,7 @@ def bootstrap_server(provider, server, admin_pass, key):
|
||||||
raise Exception("Unable to log in via SSH")
|
raise Exception("Unable to log in via SSH")
|
||||||
|
|
||||||
# hpcloud can't reliably set the hostname
|
# hpcloud can't reliably set the hostname
|
||||||
gerrit_url = 'https://review.openstack.org/p/openstack/' \
|
gerrit_url = 'https://review.openstack.org/p/openstack-infra/config.git'
|
||||||
'openstack-ci-puppet.git'
|
|
||||||
client.ssh("set hostname", "sudo hostname %s" % server.name)
|
client.ssh("set hostname", "sudo hostname %s" % server.name)
|
||||||
client.ssh("get puppet repo deb",
|
client.ssh("get puppet repo deb",
|
||||||
"sudo /usr/bin/wget "
|
"sudo /usr/bin/wget "
|
||||||
|
@ -184,11 +183,11 @@ def bootstrap_server(provider, server, admin_pass, key):
|
||||||
'--option "Dpkg::Options::=--force-confold"'
|
'--option "Dpkg::Options::=--force-confold"'
|
||||||
' --assume-yes install git puppet')
|
' --assume-yes install git puppet')
|
||||||
client.ssh("clone puppret repo",
|
client.ssh("clone puppret repo",
|
||||||
"sudo git clone %s /root/openstack-ci-puppet" % gerrit_url)
|
"sudo git clone %s /root/config" % gerrit_url)
|
||||||
client.ssh("install puppet modules",
|
client.ssh("install puppet modules",
|
||||||
"sudo /bin/bash /root/openstack-ci-puppet/install_modules.sh")
|
"sudo /bin/bash /root/config/install_modules.sh")
|
||||||
client.ssh("run puppet",
|
client.ssh("run puppet",
|
||||||
"sudo puppet apply --modulepath=/root/openstack-ci-puppet/modules:"
|
"sudo puppet apply --modulepath=/root/config/modules:"
|
||||||
"/etc/puppet/modules "
|
"/etc/puppet/modules "
|
||||||
'-e "%s"' % PUPPET_CLASS)
|
'-e "%s"' % PUPPET_CLASS)
|
||||||
|
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -8,7 +8,7 @@ setuptools.setup(
|
||||||
name="devstack-gate",
|
name="devstack-gate",
|
||||||
version="2012.2",
|
version="2012.2",
|
||||||
description="Devstack gate scripts used by Openstack CI team",
|
description="Devstack gate scripts used by Openstack CI team",
|
||||||
url='https://github.com/openstack-ci/devstack-gate',
|
url='https://github.com/openstack-infra/devstack-gate',
|
||||||
license='Apache',
|
license='Apache',
|
||||||
author='Openstack CI team',
|
author='Openstack CI team',
|
||||||
author_email='openstack@lists.launchpad.net',
|
author_email='openstack@lists.launchpad.net',
|
||||||
|
|
Loading…
Reference in New Issue