opendev/system-config
Code Issues Proposed changes

Merge "Use cgit server instead of github for everything"

Browse Source
This commit is contained in:
Jenkins 2013-08-23 17:01:32 +00:00 committed by Gerrit Code Review
commit d78e4e6acc
38 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/custom_roles.py
View File

@ -21,9 +21,10 @@
from docutils import nodes
def file_role(name, rawtext, text, lineno, inliner,
options={}, content=[]):
"""Link a local path to a Github file view.
"""Link a local path to a cgit file view.
Returns 2 part tuple containing list of nodes to insert into the
document and a list of system messages. Both are allowed to be
@ -38,7 +39,8 @@ def file_role(name, rawtext, text, lineno, inliner,
:param content: The directive content for customization.
"""
ref = 'https://github.com/openstack-infra/config/blob/master/%s' % text
ref = ('https://git.openstack.org/cgit/openstack-infra/config/tree/%s'
% text)
node = nodes.reference(rawtext, text, refuri=ref, **options)
return [node], []

4
doc/source/devstack-gate.rst
View File

@ -19,11 +19,11 @@ At a Glance
* :file:`modules/openstack_project/manifests/template.pp`
* :file:`modules/openstack_project/manifests/devstack_launch_slave.pp`
:Projects:
* http://github.com/openstack-infra/devstack-gate
* https://git.openstack.org/openstack-infra/devstack-gate
:Bugs:
* http://bugs.launchpad.net/openstack-ci
:Resources:
* `Devstack-gate README <https://github.com/openstack-infra/devstack-gate/blob/master/README.md>`_
* `Devstack-gate README <https://git.openstack.org/cgit/openstack-infra/devstack-gate/tree/README.rst>`_
Overview
========

2
doc/source/gerrit.rst
View File

@ -368,7 +368,7 @@ To rename a project:
Developers will either need to re-clone a new copy of the repository,
or manually update their remotes with something like::
git remote set-url origin https://github.com/$ORG/$PROJECT.git
git remote set-url origin https://git.openstack.org/$ORG/$PROJECT
Deleting a User from Gerrit
---------------------------

2
doc/source/git.rst
View File

@ -11,7 +11,7 @@ At a Glance
===========
:Hosts:
* http://git.openstack.org
* https://git.openstack.org
:Puppet:
* :file:`modules/cgit`
* :file:`modules/openstack_project/manifests/git.pp`

8
doc/source/irc.rst
View File

@ -26,9 +26,9 @@ At a Glance
:Projects:
* http://wiki.debian.org/MeetBot
* http://sourceforge.net/projects/supybot/
* https://github.com/openstack-infra/meetbot
* https://github.com/openstack-infra/gerritbot
* https://github.com/openstack-infra/statusbot
* https://git.openstack.org/cgit/openstack-infra/meetbot
* https://git.openstack.org/cgit/openstack-infra/gerritbot
* https://git.openstack.org/cgit/openstack-infra/statusbot
:Bugs:
* http://bugs.launchpad.net/openstack-ci
@ -63,7 +63,7 @@ Meetbot
-------
The OpenStack Infrastructure Meetbot fork can be found at
https://github.com/openstack-infra/meetbot. Manual installation of the Meetbot
https://git.openstack.org/cgit/openstack-infra/meetbot. Manual installation of the Meetbot
plugin is straightforward and documented in that repository's README.
OpenStack Infrastructure installs and configures Meetbot through Puppet.

2
doc/source/jeepyb.rst
View File

@ -23,7 +23,7 @@ At a Glance
* :file:`modules/openstack_project/templates/review.projects.yaml.erb`
* :file:`modules/openstack_project/files/pypi-mirror.yaml`
:Projects:
* http://github.com/openstack-infra/jeepyb
* https://git.openstack.org/cgit/openstack-infra/jeepyb
:Bugs:
* http://bugs.launchpad.net/openstack-ci

6
doc/source/jenkins.rst
View File

@ -83,9 +83,9 @@ Devstack Gate
OpenStack integration testing is performed by the devstack gate test
framework. This framework runs the devstack exercises and Tempest
smoketests against a devstack install on single use cloud servers. The
devstack gate source can be found on `Github
<https://github.com/openstack-infra/devstack-gate>`_ and the `Readme
<https://github.com/openstack-infra/devstack-gate/blob/master/README.rst>`_
devstack gate source can be found on `git.openstack.org
<https://git.openstack.org/cgit/openstack-infra/devstack-gate>`_ and the `Readme
<https://git.openstack.org/cgit/openstack-infra/devstack-gate/tree/README.rst>`_
describes the process of using devstack gate to run your own devstack
based tests.

6
doc/source/jjb.rst
View File

@ -19,7 +19,7 @@ At a Glance
:Configuration:
* :file:`modules/openstack_project/files/jenkins_job_builder/config/`
:Projects:
* http://github.com/openstack-infra/jenkins-job-builder
* https://git.openstack.org/cgit/openstack-infra/jenkins-job-builder
:Bugs:
* http://bugs.launchpad.net/openstack-ci
:Resources:
@ -70,8 +70,8 @@ Example defaults config:
<p>If you would like to make changes to this job, please see:
<a href="https://github.com/openstack-infra/config">
https://github.com/openstack-infra/config
<a href="https://git.openstack.org/cgit/openstack-infra/config">
https://git.openstack.org/cgit/openstack-infra/config
</a>
In modules/openstack_project/files/jenkins_jobs

4
doc/source/paste.rst
View File

@ -19,7 +19,7 @@ At a Glance
* :file:`modules/lodgeit`
* :file:`modules/openstack_project/manifests/paste.pp`
:Projects:
* http://github.com/openstack-infra/lodgeit
* https://git.openstack.org/cgit/openstack-infra/lodgeit
* https://bitbucket.org/dcolish/lodgeit-main
* http://www.pocoo.org/projects/lodgeit/
:Bugs:
@ -29,7 +29,7 @@ Overview
========
For OpenStack we use `a fork
<https://github.com/openstack-infra/lodgeit>`_ of lodgeit which is
<https://git.openstack.org/cgit/openstack-infra/lodgeit>`_ of lodgeit which is
based on one with bugfixes maintained by `dcolish
<https://bitbucket.org/dcolish/lodgeit-main>`_ but adds back missing
anti-spam features required by Openstack.

4
doc/source/planet.rst
View File

@ -18,9 +18,9 @@ At a Glance
* :file:`modules/planet`
* :file:`modules/openstack_project/manifests/planet.pp`
:Configuration:
* https://github.com/openstack/openstack-planet/blob/master/planet.ini
* https://git.openstack.org/cgit/openstack/openstack-planet/tree/planet.ini
:Projects:
* https://github.com/openstack/openstack-planet
* https://git.openstack.org/cgit/openstack/openstack-planet
* http://www.intertwingly.net/code/venus/
:Bugs:
* http://bugs.launchpad.net/openstack-ci

2
doc/source/puppet.rst
View File

@ -43,7 +43,7 @@ over the preferences file:
.. code-block:: bash
git clone git://github.com/openstack-infra/config.git /opt/config/production
git clone https://git.openstack.org/openstack-infra/config /opt/config/production
cp /opt/config/production/modules/openstack_project/files/00-puppet.pref /etc/apt/preferences.d/
Then we can add the repo and install the packages, we'll also install the hiera

4
doc/source/stackforge.rst
View File

@ -47,7 +47,7 @@ Create a new StackForge Project with Puppet
OpenStack uses Puppet and a management script to create Gerrit projects
with simple changes to the openstack-infra/config repository. To start make
sure you have cloned the openstack-infra/config repository
``git clone https://github.com/openstack-infra/config``.
``git clone https://git.openstack.org/openstack-infra/config``.
First you need to add your StackForge project to the master project
list. Edit
@ -243,7 +243,7 @@ new file will allow you to use ``git review``.
The basic process is clone from stackforge, add file, push to Gerrit,
review and approve.::
git clone https://github.com/stackforge/project-name
git clone https://git.openstack.org/stackforge/project-name
cd project-name
git checkout -b add-gitreview
cat > .gitreview <<EOF

4
doc/source/sysadmin.rst
View File

@ -14,7 +14,7 @@ collaborate on code reviews.
The configuration of every system operated by the infrastructure team
is managed by Puppet in a single Git repository:
https://github.com/openstack-infra/config
https://git.openstack.org/cgit/openstack-infra/config
All system configuration should be encoded in that repository so that
anyone may propose a change in the running configuration to Gerrit.
@ -65,7 +65,7 @@ repo::
sudo su -
apt-get install git
git clone https://github.com/openstack-infra/config
git clone https://git.openstack.org/openstack-infra/config
cd config
Then copy the etherpad node definition from manifests/site.pp to a new

2
doc/source/zuul.rst
View File

@ -23,7 +23,7 @@ At a Glance
* :file:`modules/openstack_project/files/zuul/layout.yaml`
:Projects:
* http://launchpad.net/zuul
* http://github.com/openstack-infra/zuul
* https://git.openstack.org/cgit/openstack-infra/zuul
:Bugs:
* http://bugs.launchpad.net/zuul
:Resources:

2
install_jenkins_slave.sh
View File

@ -45,7 +45,7 @@ else #defaults to Ubuntu
fi
git clone https://github.com/openstack-infra/config
git clone https://git.openstack.org/openstack-infra/config
bash config/install_modules.sh
puppet apply --modulepath=`pwd`/config/modules:/etc/puppet/modules -e 'node default {class { "openstack_project::bare_slave": install_users => false }}'

2
modules/gerrit/templates/gerrit.config.erb
View File

@ -1,5 +1,5 @@
# This file is managed by puppet.
# https://github.com/openstack-infra/config
# https://git.openstack.org/cgit/openstack-infra/config
[gerrit]
basePath = git

2
modules/gerrit/templates/replication.config.erb
View File

@ -1,5 +1,5 @@
# This file is managed by puppet.
# https://github.com/openstack-infra/config
# https://git.openstack.org/cgit/openstack-infra/config
<% replication.each do |replication| -%>
[remote "<%= replication['name'] %>"]

2
modules/jeepyb/manifests/init.pp
View File

@ -1,7 +1,7 @@
# == Class: jeepyb
#
class jeepyb (
$git_source_repo = 'https://github.com/openstack-infra/jeepyb.git',
$git_source_repo = 'https://git.openstack.org/openstack-infra/jeepyb',
) {
include mysql::python

2
modules/jenkins/manifests/job_builder.pp
View File

@ -24,7 +24,7 @@ class jenkins::job_builder (
ensure => latest,
provider => git,
revision => 'master',
source => 'https://github.com/openstack-infra/jenkins-job-builder.git',
source => 'https://git.openstack.org/openstack-infra/jenkins-job-builder',
}
exec { 'install_jenkins_job_builder':

2
modules/lodgeit/manifests/init.pp
View File

@ -48,7 +48,7 @@ class lodgeit {
vcsrepo { '/tmp/lodgeit-main':
ensure => latest,
provider => git,
source => 'https://github.com/openstack-infra/lodgeit.git',
source => 'https://git.openstack.org/openstack-infra/lodgeit',
}
# create initial git DB backup location

2
modules/meetbot/manifests/init.pp
View File

@ -4,7 +4,7 @@ class meetbot {
vcsrepo { '/opt/meetbot':
ensure => latest,
provider => git,
source => 'https://github.com/openstack-infra/meetbot.git',
source => 'https://git.openstack.org/openstack-infra/meetbot',
}
user { 'meetbot':

6
modules/openstack_project/files/jenkins-pypi-mirror.yaml
View File

@ -1,15 +1,15 @@
# This file is managed by puppet.
# https://github.com/openstack-infra/config
# https://git.openstack.org/cgit/openstack-infra/config
cache-root: /home/jenkins/pypimirror/cache
mirrors:
- name: openstack
projects:
- https://github.com/openstack/requirements
- git://git.openstack.org/openstack/requirements
output: /home/jenkins/pypimirror/mirror/openstack
- name: openstack-infra
projects:
- https://github.com/openstack-infra/config
- git://git.openstack.org/openstack-infra/config
output: /home/jenkins/pypimirror/mirror/openstack-infra

4
modules/openstack_project/files/jenkins_job_builder/config/defaults.yaml
View File

@ -7,8 +7,8 @@
<p>If you would like to make changes to this job, please see:
<a href="https://github.com/openstack-infra/config">
https://github.com/openstack-infra/config
<a href="https://git.openstack.org/cgit/openstack-infra/config">
https://git.openstack.org/cgit/openstack-infra/config
</a>
In modules/openstack_project/files/jenkins_job_builder/config

4
modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
View File

@ -353,11 +353,11 @@
- console-log
# in zuul/layout.yaml specified to only run against master branch.
# The old jenkins config polled github every 5 minutes and was also triggered
# The old jenkins config polled git every 5 minutes and was also triggered
# whenever a SNAPSHOT dependency was built. I have not configured that trigger
# here as being in the Zuul post queue may not play nice with that.
#
# We can use the github and snapshot dependency triggers if that is preferable.
# We can use the git and snapshot dependency triggers if that is preferable.
- job:
name: openstack-ha-guide
project-type: maven

6
modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
View File

@ -26,7 +26,7 @@
scm:
- git:
url: 'git://github.com/{github-org}/{name}.git'
url: 'git://git.openstack.org/{github-org}/{name}'
branches:
- 'origin/{branch}'
@ -61,7 +61,7 @@
scm:
- git:
url: 'git://github.com/{github-org}/{name}.git'
url: 'git://git.openstack.org/{github-org}/{name}'
branches:
- 'origin/{branch}'
@ -89,7 +89,7 @@
scm:
- git:
url: 'git://github.com/{github-org}/{name}.git'
url: 'git://git.openstack.org/{github-org}/{name}'
branches:
- 'origin/{branch}'

4
modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml
View File

@ -27,7 +27,7 @@
scm:
- git:
url: 'git://github.com/{github-org}/{name}.git'
url: 'git://git.openstack.org/{github-org}/{name}'
branches:
- 'origin/master'
@ -62,7 +62,7 @@
scm:
- git:
url: 'git://github.com/openstack/openstack-manuals.git'
url: 'git://git.openstack.org/openstack/openstack-manuals'
branches:
- 'origin/master'

2
modules/openstack_project/files/jenkins_job_builder/config/zuul.yaml
View File

@ -52,7 +52,7 @@
scm:
- git:
url: 'git://github.com/openstack-infra/zuul.git'
url: 'git://git.openstack.org/openstack-infra/zuul'
branches:
- 'origin/master'

11
modules/openstack_project/files/logs/help/tempest-logs.html
View File

@ -44,7 +44,12 @@
</p>
<h2>About this Help</h2>
<p>
This help file is part of the openstack-infra/config project, and
can be updated by pushing a review request to
<a href="https://github.com/openstack-infra/config/tree/master/modules/openstack_project/files/logs/help">https://github.com/openstack-infra/config/tree/master/modules/openstack_project/files/logs/help</a>
This help file is part of the
<a href="https://git.openstack.org/cgit/openstack-infra/config">
openstack-infra/config</a>
project, and can be found at
<a href="https://git.openstack.org/cgit/openstack-infra/config/tree/modules/openstack_project/files/logs/help/tempest_logs.html">
modules/openstack_project/files/logs/help/tempest_logs.html
</a>.
The file can be updated via the standard OpenStack Gerrit Review process.
</p>

11
modules/openstack_project/files/logs/help/tempest-overview.html
View File

@ -45,7 +45,12 @@ job. The basic flow of the file goes as follows:
</p>
<h2>About this Help</h2>
<p>
This help file is part of the <a href="https://github.com/openstack-infra/config">openstack-infra/config</a> project, and
can be updated by pushing a review request to
<a href="https://github.com/openstack-infra/config/tree/master/modules/openstack_project/files/logs/help">https://github.com/openstack-infra/config/tree/master/modules/openstack_project/files/logs/help</a>
This help file is part of the
<a href="https://git.openstack.org/cgit/openstack-infra/config">
openstack-infra/config</a>
project, and can be found at
<a href="https://git.openstack.org/cgit/openstack-infra/config/tree/modules/openstack_project/files/logs/help/tempest_overview.html">
modules/openstack_project/files/logs/help/tempest_overview.html
</a>.
The file can be updated via the standard OpenStack Gerrit Review process.
</p>

2
modules/openstack_project/files/nodepool/scripts/prepare_node.sh
View File

@ -19,7 +19,7 @@
HOSTNAME=$1
sudo hostname $1
wget https://raw.github.com/openstack-infra/config/master/install_puppet.sh
wget https://git.openstack.org/cgit/openstack-infra/config/plain/install_puppet.sh
sudo bash -xe install_puppet.sh
sudo git clone https://review.openstack.org/p/openstack-infra/config.git \
/root/config

6
modules/openstack_project/files/pypi-mirror.yaml
View File

@ -1,15 +1,15 @@
# This file is managed by puppet.
# https://github.com/openstack-infra/config
# https://git.openstack.org/cgit/openstack-infra/config
cache-root: /var/cache/pypimirror
mirrors:
- name: openstack
projects:
- https://github.com/openstack/requirements
- git://git.openstack.org/openstack/requirements
output: /var/lib/pypimirror/openstack
- name: openstack-infra
projects:
- https://github.com/openstack-infra/config
- git://git.openstack.org/openstack-infra/config
output: /var/lib/pypimirror/openstack-infra

2
modules/openstack_project/manifests/planet.pp
View File

@ -10,6 +10,6 @@ class openstack_project::planet (
include ::planet
planet::site { 'openstack':
git_url => 'https://github.com/openstack/openstack-planet.git',
git_url => 'git://git.openstack.org/openstack/openstack-planet',
}
}

2
modules/openstack_project/manifests/static.pp
View File

@ -291,7 +291,7 @@ class openstack_project::static (
include reviewday
reviewday::site { 'reviewday':
git_url => 'https://github.com/openstack-infra/reviewday.git',
git_url => 'git://git.openstack.org/openstack-infra/reviewday',
serveradmin => 'webmaster@openstack.org',
httproot => '/srv/static/reviewday',
gerrit_url => 'review.openstack.org',

1
modules/openstack_project/templates/review.projects.yaml.erb
View File

@ -42,7 +42,6 @@
- project: openstack-infra/nose-html-output
- project: openstack-infra/publications
description: "OpenStack Infra Team conference presentations and papers"
upstream: git://github.com/openstack-ci/publications.git
- project: openstack-infra/puppet-apparmor
- project: openstack-infra/puppet-dashboard
- project: openstack-infra/puppet-vcsrepo

2
modules/pypimirror/templates/run-mirror.sh.erb
View File

@ -1,5 +1,5 @@
#!/bin/bash -e
# This file is managed by puppet.
# https://github.com/openstack-infra/config
# https://git.openstack.org/cgit/openstack-infra/config
/usr/local/bin/run-mirror -c <%= mirror_config %> >> <%= log_filename %>

2
modules/releasestatus/manifests/init.pp
View File

@ -111,7 +111,7 @@ class releasestatus (
vcsrepo { '/var/lib/releasestatus/releasestatus':
ensure => latest,
provider => git,
source => 'https://github.com/openstack-infra/releasestatus.git',
source => 'https://git.openstack.org/openstack-infra/releasestatus',
revision => 'master',
require => File['/var/lib/releasestatus'],
}

2
modules/statusbot/manifests/init.pp
View File

@ -29,7 +29,7 @@ class statusbot(
ensure => latest,
provider => git,
revision => 'master',
source => 'https://github.com/openstack-infra/statusbot.git',
source => 'https://git.openstack.org/openstack-infra/statusbot',
}
exec { 'install_statusbot' :

2
modules/zuul/manifests/init.pp
View File

@ -27,7 +27,7 @@ class zuul (
$zuul_ssh_private_key = '',
$url_pattern = '',
$status_url = "https://${::fqdn}/",
$git_source_repo = 'https://github.com/openstack-infra/zuul.git',
$git_source_repo = 'https://git.openstack.org/openstack-infra/zuul',
$push_change_refs = false,
$job_name_in_report = false,
$revision = 'master',