diff --git a/README.md b/README.md index fc49d2a365..34a873e09c 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ either in agent or apply mode. These puppet modules require puppet 2.7 or greater. Additionally, the site.pp manifest assumes the existence of hiera. -See http://ci.openstack.org for more information. +See http://docs.openstack.org/infra/system-config for more information. Documentation ============== -The documentation presented at http://ci.openstack.org comes from +The documentation presented at http://docs.openstack.org/infra/system-config comes from git://git.openstack.org/openstack-infra/system-config repo's docs/source. To build the documentation use diff --git a/doc/source/jenkins.rst b/doc/source/jenkins.rst index 7dd96fe9ea..a938f89fb6 100644 --- a/doc/source/jenkins.rst +++ b/doc/source/jenkins.rst @@ -116,7 +116,7 @@ hand: #. Setup matrix security: add the 'authenticated' pseudo user and grant Admin access to your own user. -#. Setup one account per `http://ci.openstack.org/jenkins-job-builder/installation.html#configuration-file` +#. Setup one account per `http://docs.openstack.org/infra/jenkins-job-builder/installation.html#configuration-file` and grab the API token for it. #. Configure the number of executors you want on the Jenkins Master diff --git a/doc/source/jjb.rst b/doc/source/jjb.rst index 6a5aa58ee2..a00c73bdfb 100644 --- a/doc/source/jjb.rst +++ b/doc/source/jjb.rst @@ -23,7 +23,7 @@ At a Glance :Bugs: * https://storyboard.openstack.org/#!/project/723 :Resources: - * `Reference Manual `_ + * `Reference Manual `_ Overview ======== @@ -237,7 +237,7 @@ it finds the XML is different then it will proceed to send this to Jenkins, otherwise it is skipped. If a job is accidentally deleted then this file should be modified or removed. -.. _cache: http://ci.openstack.org/jenkins-job-builder/installation.html#running +.. _cache: http://docs.openstack.org/infra/jenkins-job-builder/installation.html#running Sending a Job to Jenkins ------------------------ diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index c0f3b19914..78e11115f0 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -26,7 +26,7 @@ At a Glance :Bugs: * https://storyboard.openstack.org/#!/project/668 :Resources: - * `Nodepool Reference Manual `_ + * `Nodepool Reference Manual `_ Overview ======== diff --git a/doc/source/running-your-own.rst b/doc/source/running-your-own.rst index a76d22ab34..11cde68318 100644 --- a/doc/source/running-your-own.rst +++ b/doc/source/running-your-own.rst @@ -52,7 +52,7 @@ Initial setup For more details on the config repo split, read the following spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/config-repo-split.html. -#. Follow http://ci.openstack.org/puppet.html#id2 and use your repository +#. Follow http://docs.openstack.org/infra/system-config/puppet.html#id2 and use your repository in addition to the OpenStack CI repository. This is appropriate to stay in sync with OpenStack Infra team rolling out new functionality and at the same time applying the necessary customizations through the config overrides. @@ -354,7 +354,7 @@ which get the most load (as they run jobs from anyone). #. Update hiera with the relevant parameters. You'll need to get the jenkins_jobs_password from Jenkins (see - `http://ci.openstack.org/jenkins-job-builder/installation.html#configuration-file`) + `http://docs.openstack.org/infra/jenkins-job-builder/installation.html#configuration-file`) after Jenkins is up - start with it set to ''. You can use your own user or make a dedicated user. diff --git a/doc/source/storyboard.rst b/doc/source/storyboard.rst index ded2b38b81..8d20653251 100644 --- a/doc/source/storyboard.rst +++ b/doc/source/storyboard.rst @@ -29,7 +29,7 @@ At a Glance :Bugs: * https://storyboard.openstack.org/#!/project/456 :Resources: - * `StoryBoard Documentation `_ + * `StoryBoard Documentation `_ * `StoryBoard Wiki `_ * `StoryBoard Roadmap `_ diff --git a/doc/source/third_party.rst b/doc/source/third_party.rst index 810e9e2553..e00aaa8116 100644 --- a/doc/source/third_party.rst +++ b/doc/source/third_party.rst @@ -284,7 +284,7 @@ uploaded and will report the results to Gerrit automatically. The Zuul Gerrit Trigger Way --------------------------- -`Zuul `_ is a tool that determines what jobs are run when. +`Zuul `_ is a tool that determines what jobs are run when. Zuul listens to the Gerrit event stream, and first tries to match each event to one or more pipelines. Zuul’s pipelines are configured in a single file called layout.yaml. Here’s a snippet from that file that constructs the ``check`` pipeline taken from this @@ -312,7 +312,7 @@ patch set created. The matching event will invoke the configured Jenkins job(s) to Gerrit with a ``verified +1`` vote, and if any one fails, with a ``verified -1``. The sample includes other possible configurations, or you can configure your own by -following the `Zuul layout documentation `_ +following the `Zuul layout documentation `_ After a Gerrit event matches a pipeline, Zuul will look at the project identified in that Gerrit event and invoke the Jenkins jobs specified in the ``projects`` section @@ -343,7 +343,7 @@ and project-pipeline-job definitions. Managing Jenkins Jobs --------------------- When code is pushed to Gerrit, a series of jobs are triggered that run a series -of tests against the proposed code. `Jenkins `_ +of tests against the proposed code. `Jenkins `_ is the server that executes and manages these jobs. It is a Java application with an extensible architecture that supports plugins that add functionality to the base server. @@ -354,15 +354,15 @@ You may manually edit a Jenkins job as an administrator in Jenkins. However, in a testing platform as large as the upstream OpenStack CI system, doing so manually would be virtually impossible and fraught with errors. Luckily, there is a helper tool called `Jenkins Job Builder (JJB) -`_ that +`_ that constructs and manages these XML configuration files after reading a set of YAML files and job templating rules. These references provide more details: * `A basic overview of using JJB to define projects, templates, and jobs in yaml - format is available here. `_ + format is available here. `_ * `The official documentation to define Jenkins jobs using JJB is here. - `_ + `_ * `The JJB description of all jobs used by OpenStack are defined in this folder. `_ diff --git a/doc/source/zuul.rst b/doc/source/zuul.rst index 794561d574..5f561031b1 100644 --- a/doc/source/zuul.rst +++ b/doc/source/zuul.rst @@ -26,7 +26,7 @@ At a Glance :Bugs: * https://storyboard.openstack.org/#!/project/679 :Resources: - * `Zuul Reference Manual `_ + * `Zuul Reference Manual `_ Overview ======== diff --git a/modules/openstack_project/templates/zuul/status.html.erb b/modules/openstack_project/templates/zuul/status.html.erb index 358d0813d1..c5574f9478 100644 --- a/modules/openstack_project/templates/zuul/status.html.erb +++ b/modules/openstack_project/templates/zuul/status.html.erb @@ -260,7 +260,7 @@ progress[aria-valuenow]:before { system. Each of the sections below is a separate pipeline configured to automate some portion of the testing or operation of the OpenStack project. For more information, please see - the Zuul reference manual. + the Zuul reference manual.

diff --git a/setup.cfg b/setup.cfg index b85de267ac..6779278c3c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description-file = README.md author = OpenStack Infrastructure Team author-email = openstack-infra@lists.openstack.org -home-page = http://ci.openstack.org/ +home-page = http://docs.openstack.org/infra/system-config/ classifier = Environment :: OpenStack Intended Audience :: Information Technology