Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions developers/continuous-integration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,37 +82,37 @@ Jenkins jobs

- * Release OMERO docs
* ome-documentation.git_
* :term:`OMERO-docs-release-4.4`
* :term:`OMERO-docs-release-stable`
* N/A

- * Release Bio-Formats docs
* bioformats.git_
* :term:`BIOFORMATS-docs-release-4.4`
* :term:`BIOFORMATS-docs-release-stable`
* N/A

- * Review OMERO code PRs
* openmicroscopy.git_
* :term:`OMERO-merge-4.4`
* :term:`OMERO-merge-stable`
* :term:`OMERO-merge-develop`

- * Review OMERO doc PRs
* ome-documentation.git_
* :term:`OMERO-docs-merge-4.4`
* :term:`OMERO-docs-merge-stable`
* :term:`OMERO-docs-merge-develop`

- * Review Bio-Formats doc PRs
* bioformats.git_
* :term:`BIOFORMATS-docs-merge-4.4`
* :term:`BIOFORMATS-docs-merge-stable`
* :term:`BIOFORMATS-docs-merge-develop`

- * Build OMERO
* openmicroscopy.git_
* :term:`OMERO-4.4`
* :term:`OMERO-stable`
* :term:`OMERO-trunk`

- * Build BIOFORMATS
* bioformats.git_
* :term:`BIOFORMATS-4.4`
* :term:`BIOFORMATS-stable`
* :term:`BIOFORMATS-trunk`

.. |merge| replace:: Merge PRs using :ref:`scc merge`
Expand All @@ -125,11 +125,11 @@ Current major release
^^^^^^^^^^^^^^^^^^^^^

The branch for the current major release is |devbranch|. All jobs are listed
under the |version| view tab of Jenkins.
under the :jenkinsview:`Stable <2.%20Stable>` view tab of Jenkins.

.. glossary::

:jenkinsjob:`OMERO-docs-release-4.4`
:jenkinsjob:`OMERO-docs-release-stable`

Update the official documentation for the current OMERO release

Expand All @@ -139,7 +139,7 @@ under the |version| view tab of Jenkins.
#. |ssh-doc| :file:`/var/www/www.openmicroscopy.org/sphinx-docs/ome-release.tmp`
#. |deploy-doc| http://www.openmicroscopy.org/site/support/omero4/

:jenkinsjob:`BIOFORMATS-docs-release-4.4`
:jenkinsjob:`BIOFORMATS-docs-release-stable`

Update the official documentation for the current Bio-Formats release

Expand All @@ -149,24 +149,24 @@ under the |version| view tab of Jenkins.
#. |ssh-doc| :file:`/var/www/www.openmicroscopy.org/sphinx-docs/bf-release.tmp`
#. |deploy-doc| http://www.openmicroscopy.org/site/support/bio-formats/

:jenkinsjob:`OMERO-4.4`
:jenkinsjob:`BIOFORMATS-4.4`
:jenkinsjob:`OMERO-stable`
:jenkinsjob:`BIOFORMATS-stable`

Build current release of OMERO/Bio-Formats

#. Build server and release-docs
#. If the build is promoted,
#. Use artifacts for point release

:jenkinsjob:`OMERO-merge-4.4`
:jenkinsjob:`OMERO-merge-stable`

Review code PRs for the next OMERO point release

#. |merge| and push to snoopycrimecop/merge/|devbranch|/latest
#. Run :source:`docs/hudson/OMERO.sh`
#. Deploy the server on howe

:jenkinsjob:`OMERO-docs-merge-4.4`
:jenkinsjob:`OMERO-docs-merge-stable`

Review doc PRs for the current OMERO release or for the next OMERO
point release
Expand All @@ -177,7 +177,7 @@ under the |version| view tab of Jenkins.
#. |ssh-doc| :file:`/var/www/www.openmicroscopy.org/sphinx-docs/ome-staging.tmp`
#. |deploy-doc| http://www.openmicroscopy.org/site/support/omero4-staging/

:jenkinsjob:`BIOFORMATS-docs-merge-4.4`
:jenkinsjob:`BIOFORMATS-docs-merge-stable`

Review doc PRs for the current Bio-Formats release or for the next
Bio-Formats point release
Expand All @@ -192,7 +192,7 @@ Next major release
^^^^^^^^^^^^^^^^^^

The branch for the next major release is develop. All jobs are listed under
the Trunk view tab of Jenkins.
the :jenkinsview:`Trunk <1.%20Trunk>` view tab of Jenkins.

.. glossary::

Expand Down
4 changes: 2 additions & 2 deletions developers/scc-scripts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ served by Apache without downtime and HTTP 404s.

The logic behind the scripts follows the method outlined in
https://gist.github.com/3807742#file_symlink_replacement.md. The hudson jobs
:term:`BIOFORMATS-docs-merge-4.4`, :term:`BIOFORMATS-docs-merge-develop`,
:term:`OMERO-docs-merge-4.4`, :term:`OMERO-docs-merge-develop` and
:term:`BIOFORMATS-docs-merge-stable`, :term:`BIOFORMATS-docs-merge-develop`,
:term:`OMERO-docs-merge-stable`, :term:`OMERO-docs-merge-develop` and
OMERO-docs-internal deploy the documentation artifacts to necromancer. The
target directory (sphinx-docs) is controlled by the hudson:hudson user, so all
file system operations are allowed. Each job has the target directory
Expand Down