Remove reference to ci.o.org

README.rst

@@ -432,9 +432,7 @@ Jenkins links
 =============
 
 Links to the continuous integration server can be created using the 
-``jenkins`` alias for the main server, e.g. ``:jenkins: `Jenkins server <>```,
-the ``jenkinsjob`` alias for a given job, e.g. ``:jenkinsjob: `OMERO-4.4``` or
-the ``jenkinsview`` alias for a given view, e.g. ``:jenkinsview: `4.4```.
+``mergeci`` alias for the main server, e.g. ``:mergeci: `Jenkins server <>```.
 
 Mailing-list links
 ==================

common/conf.py

@@ -130,15 +130,8 @@ def get_previous_version(majornumber, minornumber=0):
 bf_github_root = github_root + user + '/bioformats/'
 doc_github_root = github_root + user + '/ome-documentation/'
 
-# Variables used to define Jenkins extlinks (ci-master)
-jenkins_root = 'https://ci.openmicroscopy.org'
-jenkins_job_root = jenkins_root + '/job'
-jenkins_view_root = jenkins_root + '/view'
-
 # Variables used to define Jenkins extlinks (merge-ci)
 mergeci_root = 'https://merge-ci.openmicroscopy.org/jenkins'
-mergeci_job_root = mergeci_root + '/job'
-mergeci_view_root = mergeci_root + '/view'
 
 # Variables used to define other extlinks
 cvs_root = 'http://cvs.openmicroscopy.org.uk'
@@ -159,13 +152,8 @@ def get_previous_version(majornumber, minornumber=0):
     'ticket': (trac_root + '/ticket/%s', '#%s'),
     'milestone': (trac_root + '/milestone/%s', None),
     'report': (trac_root + '/report/%s', None),
-    # Jenkins links (ci-master)
-    'jenkins': (jenkins_root + '/%s', None),
-    'jenkinsjob': (jenkins_job_root + '/%s', None),
-    'jenkinsview': (jenkins_view_root + '/%s', None),
     # Jenkins links (merge-ci)
     'mergeci': (mergeci_root + '/%s', None),
-    'mergecijob': (mergeci_job_root + '/%s', None),
     # Mailing list/forum links
     'ome-users': (lists_root + '/pipermail/ome-users/%s', None),
     'ome-devel': (lists_root + '/pipermail/ome-devel/%s', None),

omero/conf.py

@@ -91,15 +91,8 @@ def get_previous_version(majornumber, minornumber=0):
 bf_github_root = github_root + user + '/bioformats/'
 doc_github_root = github_root + user + '/ome-documentation/'
 
-# Variables used to define Jenkins extlinks (ci-master)
-jenkins_root = 'https://ci.openmicroscopy.org'
-jenkins_job_root = jenkins_root + '/job'
-jenkins_view_root = jenkins_root + '/view'
-
 # Variables used to define Jenkins extlinks (merge-ci)
 mergeci_root = 'https://merge-ci.openmicroscopy.org/jenkins'
-mergeci_job_root = mergeci_root + '/job'
-mergeci_view_root = mergeci_root + '/view'
 
 # Variables used to define other extlinks
 cvs_root = 'http://cvs.openmicroscopy.org.uk'
@@ -208,13 +201,8 @@ def get_previous_version(majornumber, minornumber=0):
     'ticket': (trac_root + '/ticket/%s', '#%s'),
     'milestone': (trac_root + '/milestone/%s', None),
     'report': (trac_root + '/report/%s', None),
-    # Jenkins links (ci-master)
-    'jenkins': (jenkins_root + '/%s', None),
-    'jenkinsjob': (jenkins_job_root + '/%s', None),
-    'jenkinsview': (jenkins_view_root + '/%s', None),
     # Jenkins links (merge-ci)
     'mergeci': (mergeci_root + '/%s', None),
-    'mergecijob': (mergeci_job_root + '/%s', None),
     # Mailing list/forum links
     'ome-users': (lists_root + '/pipermail/ome-users/%s', None),
     'ome-devel': (lists_root + '/pipermail/ome-devel/%s', None),

omero/developers/GettingStarted/AdvancedClientDevelopment.rst

@@ -2378,7 +2378,7 @@ in `github <https://github.com/ome/openmicroscopy>`_.
 
 We plan to include packages of the generated source code in future
 releases. Until then, it is possible to find our latest builds on 
-:jenkins:`jenkins <>` or to build them locally, although some of the
+:mergeci:`jenkins <>` or to build them locally, although some of the
 generated files are later overwritten by hand-written versions:
 
 -  model is located in ``components/tools/OmeroCpp/src/omero/model/``

omero/developers/Java.rst

@@ -32,7 +32,7 @@ Extended classpath
 ------------------
 
 To use the importer, you will need more jar files. To see all the
-current requirements, take a look at the builds on :jenkins:`Jenkins
+current requirements, take a look at the builds on :mergeci:`Jenkins
 <>`, or alternatively examine the dependencies in the :file:`build.gradle`
 files (e.g. :insight_source:`build.gradle`).
 

omero/developers/build-system.rst

@@ -192,7 +192,7 @@ Jenkins
 ^^^^^^^
 
 The OME project currently uses Jenkins_ as
-a continuous integration server available :jenkins:`here <>`, so many
+a continuous integration server available :mergeci:`here <>`, so many
 binary packages can be downloaded without compiling them yourself. See the :devs_doc:`Continuous Integration documentation <ci-omero.html>` for further details.
 
 Server build