From 0ce27b0af60d1625daf78d6ef3ef832616d8ac85 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 21 Dec 2011 09:34:01 +0000 Subject: [PATCH] Remove old information about Tarmac from CI docs. Change-Id: If3e1b6b8e984ee28b50bb5d4a2b54297becee8af --- doc/index.rst | 1 - doc/jenkins.rst | 6 ++---- doc/tarmac.rst | 55 ------------------------------------------------- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 doc/tarmac.rst diff --git a/doc/index.rst b/doc/index.rst index 0098546d..68ec7dab 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -25,7 +25,6 @@ Contents: systems jenkins gerrit - tarmac Indices and tables ================== diff --git a/doc/jenkins.rst b/doc/jenkins.rst index be79443f..c8d56114 100644 --- a/doc/jenkins.rst +++ b/doc/jenkins.rst @@ -25,10 +25,8 @@ through Jenkins can be thought of as having a few discreet components: The OpenStack Jenkins can be found at http://jenkins.openstack.org -The current system uses :doc:`tarmac` to manage Launchpad Merge -Proposals for projects using bzr as a version control system. As we add -projects which are using git, or migrate projects from bzr to git, we are -using :doc:`gerrit` +OpenStack uses :doc:`gerrit` to manage code reviews, which in turns calls +Jenkins to test those reviews. Authorization ************* diff --git a/doc/tarmac.rst b/doc/tarmac.rst deleted file mode 100644 index 278c9f48..00000000 --- a/doc/tarmac.rst +++ /dev/null @@ -1,55 +0,0 @@ -:title: Tarmac Configuration - -Tarmac -###### - -Overview -******** - -Tarmac is a Patch Queue Manager written to manage and land merge requests in -Launchpad. It is not integrated in to Jenkins, and therefore does not -trigger Jenkins jobs to determine if a branch is good. Rather, Jenkins -triggers tarmac on a periodic basis and tarmac checks the merge queue, -performs its own tests on the branch, and either passes and merges the -branch in question, or fails the branch, reports the error to the merge -request and sets the status back to Work In Progress. - -Installation -************ - -Tarmac is installed from packages in the Tarmac PPA. It currently is -installed and runs only on the Jenkins master. - -Install Tarmac PPA ------------------- -:: - - add-apt-repository ppa:tarmac/ppa - -Install Tarmac --------------- -:: - - apt-get install tarmac - -Configuration -************* - -Tarmac keeps its config file in .config/tarmac/tarmac.conf in standard ini -format. That config file is, in turn, stored in -git://github.com/openstack/openstack-ci.git - -Authentication -************** - -Tarmac authenticates to launchpad via oauth as the hudson-openstack user. - -Operation -********* - -Tarmac is a command line program, which takes a subcommand and then a branch -to land as arguments. - -:: - - tarmac land lp:nova