Merge pull request circleci#3928 from circleci/release/server-2-18-1

michelle-luna · web-flow · commit 11055f4aa37d · 2019-11-14T13:34:33.000-08:00
2.18 server release
diff --git a/jekyll/_cci2/updating-server-replicated-version.adoc b/jekyll/_cci2/updating-server-replicated-version.adoc
@@ -11,7 +11,7 @@ To update your CircleCI Server installation, see our https://circleci.com/docs/2
 
 * Your installation is Ubuntu 14.04 or 16.04 based.
 * Your installation is **not** airgapped and you can access the internet from it.
-* You are running replicated version >=2.10.3 on your services machine. To check this, SSH into the Services machine and run the following:
+* We will be updating to Replicated v2.38, but first we need to check you are running at least v2.10.3 on your Services machine. To check this, SSH into the Services machine and run the following:
 +
 ```shell
 replicated --version
diff --git a/jekyll/_cci2/updating-server.adoc b/jekyll/_cci2/updating-server.adoc
@@ -5,7 +5,7 @@
 :toc: macro
 :toc-title:
 
-This section describes the process for upgrading your CircleCI Server installation from v2.17 to v2.18.
+This section describes the process for upgrading your CircleCI Server installation from v2.17.x to v2.18.1. If you have already upgraded to v2.18 and would like steps to upgrade to patch release v2.18.1, first take a <<1-snapshot-for-rollback,snapshot>> and then follow the <<3-upgrade-circleci-server,application upgrade steps>>.
 
 toc::[]
 
@@ -23,9 +23,9 @@ or you suspect that an **organization rename might have happened at any point**.
 
 Following is an overview of the CircleCI Server upgrade steps. Each stage is described in detail below.
 
-* Take a snapshot of your installation so you can rollback later if necessary (optional but recommended)
-* Update Replicated and check you are running Docker v17.12.1, update if necessary
-* Install the latest version of CircleCI Server
+* Take a <<1-snapshot-for-rollback,snapshot>> of your installation so you can rollback later if necessary (optional but recommended)
+* Update <<2-updating-replicated,Replicated>> and check you are running Docker v17.12.1, update if necessary
+* <<3-upgrade-circleci-server,Install the latest version of CircleCI Server>>
 
 === 1. Snapshot for Rollback
 
@@ -49,19 +49,20 @@ If you do need to rollback at any point, see our https://circleci.com/docs/2.0/b
 
 === 2. Updating Replicated
 
-==== Prerequisites
+==== a. Prerequisites
 
 * Your installation is Ubuntu 14.04 or 16.04 based.
 * Your installation is **not** airgapped and you can access the internet from it.
-* You are running Replicated version >=2.10.3 on your Services machine. To check this, SSH into the Services machine and run the following:
+* We will be updating to Replicated v2.38, but first we need to check you are running at least v2.10.3 on your Services machine. To check this, SSH into the Services machine and run the following:
 +
 ```shell
 replicated --version
 ```
 +
-If you are running a version of Replicated pre 2.10.3 please reach out to support@circleci.com.
+If you are running a version of Replicated pre v2.10.3 please reach out to support@circleci.com.
+If you are already on v2.38 you can skip the next step and move to <<3-upgrade-circleci-server,upgrade the CircleCI application>>
 
-==== Preparations
+==== b. Preparations
 
 CAUTION: Remember to take a snapshot (described above) before starting the Replicated update process
 
@@ -111,7 +112,7 @@ sudo apt-get install docker-ce=17.12.1~ce-0~ubuntu
 sudo apt-mark hold docker-ce
 ```
 
-==== Perform Update
+==== c. Perform Update
 
 . Perform the Replicated update by executing the update script as follows:
 +
@@ -155,7 +156,7 @@ Example output:
 ]
 ```
 
-=== 3. Upgrade CircleCI Server Version
+=== 3. Upgrade CircleCI Server
 
 . Once you are running the latest version of Replicated, click the View Update button in the Management Console dashboard.
 +
diff --git a/jekyll/_cci2/v.2.18-overview.md b/jekyll/_cci2/v.2.18-overview.md
@@ -20,23 +20,6 @@ This document provides a summary of features and product notes for the release o
 * We have made some changes to our Redis configuration. If you have externalized Redis then you’ll need to update your configuration. Please contact your Customer Success Manager.
 * We have also made changes to our Postgres version and require at least postgreSQL v9.5.16. If you have externalized postgreSQL then please update to at least that version in 2.17.x before upgrading to 2.18.
 
-## Known Issues
-
-Nomad garbage collection only runs every 4 hours. This could prevent nomad jobs from running in environments with heavy usage. If you hit this bug please follow this work around:
-
-1. Create `/etc/circleconfig/schedulerer/customizations` on the services machine
-2. Inside `/etc/circleconfig/schedulerer/customizations` enter the following:
-
-```shell
-export SCHEDULERER_NOMAD_BACKPRESSURE_MAX_PENDING_JOBS=500
-export SCHEDULERER_NOMAD_BACKPRESSURE_MAX_DEAD_JOBS=100000
-```
-3. Restart the `picard-scheduler` container:
-
-```shell
-sudo docker restart picard-scheduler
-```
-
 ## What's New in Release 2.18
 
 * It is now possible to restrict environment variables at run time by adding security groups to contexts. Security groups are defined as GitHub teams or LDAP groups. After a security group is added to a context, only CircleCI users who are members of that security group may access or use the environment variables of the context. For more information see our [guide to restricting a context](https://circleci.com/docs/2.0/contexts/#restricting-a-context).
diff --git a/jekyll/_data/sidenav.yml b/jekyll/_data/sidenav.yml
@@ -280,14 +280,14 @@ en:
 - name: Server Administration
   icon: docs/admin.svg
   children:
-    - name: Server v2.18.x Install
+    - name: Server v2.18.1 Install
       link: 2.0/install-overview/
       children:
         - name: Overview
           link: 2.0/install-overview/
         - name: What's New in v2.18
           link: 2.0/v.2.18-overview/
-        - name: Upgrade to v2.18.x
+        - name: Upgrade to v2.18.1
           link: 2.0/updating-server/
         - name: System Requirements
           link: 2.0/server-ports/
@@ -301,7 +301,7 @@ en:
           link: 2.0/upgrading/
         - name: Trial Single-box Install
           link: 2.0/single-box/
-    - name: Server v2.18.x Operations
+    - name: Server v2.18.1 Operations
       link: 2.0/overview/
       children:
         - name: Overview
diff --git a/jekyll/assets/img/docs/release_history.png b/jekyll/assets/img/docs/release_history.png

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ To update your CircleCI Server installation, see our https://circleci.com/docs/2`
`11`	`11`
`12`	`12`	`* Your installation is Ubuntu 14.04 or 16.04 based.`
`13`	`13`	`* Your installation is not airgapped and you can access the internet from it.`
`14`		`-* You are running replicated version >=2.10.3 on your services machine. To check this, SSH into the Services machine and run the following:`
	`14`	`+* We will be updating to Replicated v2.38, but first we need to check you are running at least v2.10.3 on your Services machine. To check this, SSH into the Services machine and run the following:`
`15`	`15`	`+`
`16`	`16`	```shell
`17`	`17`	`replicated --version`