Document more release todo items.
howto/release/jenkins
---------------------
o Document LTS view creation.
Misc
----
o Remove a few stray merge conflict markers that were added.
Change-Id: I5cd30f126383783b826362f100f169d66fe49170
diff --git a/VERSION b/VERSION
index c7e0a98..35a5840 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11.1-dev1
+2.11.1-dev2
diff --git a/howto/release/components/voltha-lib-go.rst b/howto/release/components/voltha-lib-go.rst
index 8785b06..22ec852 100644
--- a/howto/release/components/voltha-lib-go.rst
+++ b/howto/release/components/voltha-lib-go.rst
@@ -20,16 +20,9 @@
Release
-------
-<<<<<<< HEAD
- Bump VERSION file to a non-dev semantic version.
- See Validate above
- Commit and approve to trigger a build
-=======
-<<<<<<< HEAD
-- Bump VERSION file to a non-dev semantic version.
-- See Validate above
-- Commit and approve to trigger a build
-=======
- Bump /opencord/ component versions in go.mod
- make distclean
- make mod-update
@@ -41,6 +34,3 @@
- Commit changes and create a pull request.
- Once approved a jenkins job will launch.
-
->>>>>>> cb4f2e0 (VOL-4840 - Tracking ticket for release documentation.)
->>>>>>> f854950 (VOL-4840 - Tracking ticket for release documentation.)
diff --git a/howto/release/index.rst b/howto/release/index.rst
index 39d5cf5..f68d6b7 100644
--- a/howto/release/index.rst
+++ b/howto/release/index.rst
@@ -6,6 +6,7 @@
ci-management/index
components/index
hierarchy/index
+ jenkins/index
voltha-docs/index
post-release/index
diff --git a/howto/release/jenkins/index.rst b/howto/release/jenkins/index.rst
new file mode 100644
index 0000000..eb9d53d
--- /dev/null
+++ b/howto/release/jenkins/index.rst
@@ -0,0 +1,7 @@
+Jenkins
+=======
+
+.. toctree::
+ :maxdepth: 1
+
+ views
diff --git a/howto/release/jenkins/views.rst b/howto/release/jenkins/views.rst
new file mode 100644
index 0000000..93c4646
--- /dev/null
+++ b/howto/release/jenkins/views.rst
@@ -0,0 +1,28 @@
+Job Views
+=========
+
+LTS
+---
+
+With each major LTS voltha release (v2.11, v2.8) a new jenkins view will
+need to be created.
+
+- Navigate to `jenkins.opencord.org <https://jenkins.opencord.org>`_.
+- Click "New View" from the jenkins UI.
+- Name: VOLTHA-X.Y
+- Job filters
+
+ - Click "Use a regular expression to include jobs into the view"
+ - Regular expression: .*voltha.*[_-]2\.11.*
+
+ - Match branch name voltha-2.11
+
+ - `verify_bbsim-sadis-server_sanity-test-voltha-2.11 <https://jenkins.opencord.org/view/VOLTHA-2.11/job/verify_bbsim-sadis-server_sanity-test-voltha-2.11>`_
+
+ - Match derived job name voltha_2.11
+
+ - `verify_berlin-community-pod-1-gpon-adtran_Default_DT_voltha_2.11_dmi <https://jenkins.opencord.org/view/VOLTHA-2.11/job/verify_berlin-community-pod-1-gpon-adtran_Default_DT_voltha_2.11_dmi>`_
+
+ - Match derived job name: voltha.*2.11
+
+ - `periodic-voltha-test-bbsim-2.11 <https://jenkins.opencord.org/view/VOLTHA-2.11/job/periodic-voltha-test-bbsim-2.11>`_