Merge branch '1.36.1' into merge-1.36.1-into-master

Author: ansmithf5

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 Changes to this project are documented in this file. More detail and links can be found in the Declarative Onboarding [Document Revision History](https://clouddocs.f5.com/products/extensions/f5-declarative-onboarding/latest/revision-history.html).
 
+## 1.36.1
+### Added
+
+### Fixed
+
+### Changed
+- Promoted to LTS
+
+### Removed
+
 ## 1.36.0
 ### Added
 

SUPPORT.md

@@ -13,10 +13,10 @@ Currently supported versions:
 
 | Software Version | Release Type  | First Customer Ship | End of Support  |
 |------------------|---------------|---------------------|-----------------|
-| DO 1.27.1        | LTS           | 08-Mar-2022         | 08-Mar-2023     |
 | DO 1.34.0        | Feature       | 15-Nov-2022         | 15-Feb-2023     |
 | DO 1.35.0        | Feature       | 12-Jan-2023         | 12-Apr-2023     |
 | DO 1.36.0        | Feature       | 09-Feb-2023         | 09-May-2023     |
+| DO 1.36.1        | LTS           | 09-Mar-2023         | 09-Mar-2024     |
 
 
 \* Fix for Allowed schema version
@@ -62,6 +62,7 @@ Versions no longer supported:
 | DO 1.31.0        | Feature       | 15-Jul-2022         | 15-Oct-2022     |
 | DO 1.32.0        | Feature       | 23-Aug-2022         | 23-Nov-2022     |
 | DO 1.33.0        | Feature       | 04-Oct-2022         | 04-Jan-2023     |
+| DO 1.27.1        | LTS           | 08-Mar-2022         | 08-Mar-2023     |
 
 \* Fix for updated Docker Container packaging only
 

contributing/process_release.md

@@ -30,6 +30,36 @@
     * Tag the appropriate branch with the updated version (e.g. v1.34.0-4). The tag will kick off a DO pipeline with integration tests.
 * If the DO pipeline is successful, that pipeline will upload the build artifacts to Artifactory and send the release email to the `f5-declarative-onboarding` distribution list.
 
+## Process for LTS release
+* Using the GitLab GUI, create a branch from the release branch that we are declaring LTS. Bump the patch version by 1. For example, if we are declaring 1.36.0 to be LTS, then create a 1.36.1 branch from 1.36.0.
+* On your local machine, fetch and checkout the LTS branch.
+* Create a new local branch from the LTS branch (e.g. "prepare-1.36.1-release").
+* Update the patch version in `package.json` and `package-lock.json`.  The release number of the new version should start at 0 (e.g. 1.36.0-4 would become 1.36.1-0).
+* Add a new CHANGELOG section that looks like
+    ```
+    ## 1.36.1
+    ### Added
+
+    ### Fixed
+
+    ### Changed
+    - Promoted to LTS
+
+    ### Removed
+    ```
+* Create an MR for these changes. Important: Remember to set the branch you are merging into to the LTS branch.
+* Go to the atg-build project in GitLab
+  * Edit the DO schedule to set the `gitBranch` variable to the LTS branch.
+  * Run the DO schedule.
+  * After the build completes, edit the DO schedule to set the `gitBranch` variable back to develop.
+* Using the GUI create a tag off the LTS branch (e.g. 1.36.1)
+  * In the GUI go to `Repository -> Tags -> New tag`.
+  * The name of the tag should be the LTS version with a 'v' at the front (e.g. v1.36.1).
+  * Update the `createFrom` to point at the LTS branch.
+  * Set the message to: `LTS release v<LTS version>` (e.g. "LTS release v1.36.1")
+* Merge the release branch (without updating the package version) into develop and create an MR for this.
+* Merge the release branch (without updating the package version) into master and create an MR for this.
+
 ## Process for release
 ### Begin process release at the very beginning of the first sprint of a new release, by performing the following actions:
 * Follow the instructions for setting up a release candidate (see [Process for release candidates](#Process-for-release-candidates)).

docs/conf.py

@@ -85,7 +85,7 @@
 # The short X.Y version.
 version = u''
 # The full version, including alpha/beta/rc tags.
-release = u'1.36.0'
+release = u'1.36.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/revision-history.rst

@@ -11,6 +11,10 @@ Document Revision History
         - Description
         - Date
 
+      * - 1.36.1
+        - Released BIG-IP Declarative Onboarding 1.36.1 as a LTS (Long Term Support) version. See the BIG-IP Declarative Onboarding |supportmd| for information about the BIG-IP Declarative Onboarding support policy.
+        - 3-9-23
+
       * - 1.36
         - Updated the documentation for Declarative Onboarding v1.36.0.  This release contains the following changes: |br| * The default value for **allowService** on a **SelfIp** is now **none** (see :ref:`Self IP class<selfip-class>`) |br| * Updated VXLAN tunnel creation to respect TrafficControl acceptIpOptions values (see the note in :ref:`VXLAN tunnels<vxlan>`) 
         - 2-9-23

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "f5-declarative-onboarding",
-  "version": "1.36.0-4",
+  "version": "1.36.1-1",
   "description": "F5 Declarative Onboarding",
   "main": "index.js",
   "repository": {

package.json

@@ -1,11 +1,11 @@
 {
   "versionMetaTimestamp": 1540928503,
   "latestVersion": {
-    "name": "1.35 (non-LTS)",
+    "name": "1.36 (non-LTS)",
     "url": "/products/extensions/f5-declarative-onboarding/latest/"
   },
   "otherVersions": [
-    { "name": "1.21.1 (LTS)", "url": "/products/extensions/f5-declarative-onboarding/1.21/"},
-    { "name": "1.27.1 (LTS)", "url": "/products/extensions/f5-declarative-onboarding/1.27/" }
+    { "name": "1.27.1 (LTS)", "url": "/products/extensions/f5-declarative-onboarding/1.27/"},
+    { "name": "1.36.1 (LTS)", "url": "/products/extensions/f5-declarative-onboarding/1.36/" }
   ]
 }