Merge pull request #2499 from mboersma/update-release-docs

Update release docs and fix version utility

Author: mboersma

contrib/bumpver/bump.go

@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"os"
 	"regexp"
-	"strings"
 
 	docopt "github.com/docopt/docopt-go"
 )
@@ -58,13 +57,8 @@ Options:
 				continue
 			}
 		}
-		// replace the first occurrence in source files
-		count := 1
-		if strings.HasSuffix(name, ".md") || strings.HasSuffix(name, ".rst") {
-			// replace all occurrences in docs
-			count = -1
-		}
-		data = bytes.Replace(src, from, []byte(version), count)
+		// replace all occurrences in source and doc files
+		data = bytes.Replace(src, from, []byte(version), -1)
 		f, err := os.Create(name)
 		if err != nil {
 			return onError(err)

contrib/bumpver/bump_test.go

@@ -238,16 +238,21 @@ coreos:
     peer-election-timeout: 2000
     # heartbeat interval should ideally be 1/4 or 1/5 of peer election timeout
     peer-heartbeat-interval: 500
+  units:
+  - name: install-deisctl.service
+    command: start
+    content: |
+      [Unit]
+      Description=Install deisctl utility
+
+      [Service]
+      Type=oneshot
+      ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 2.22.0'
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=2.22.0
-  - path: /etc/profile.d/nse-function.sh
-    permissions: '0755'
-    content: |
-      function nse() {
-        sudo nsenter --pid --uts --mount --ipc --net --target $(docker inspect --format="{{ .State.Pid }}" $1)
-      }
+      DEIS_RELEASE=v2.22.0
+  - path: /etc/motd
 `
 
 var userdataAfter = `
@@ -264,16 +269,21 @@ coreos:
     peer-election-timeout: 2000
     # heartbeat interval should ideally be 1/4 or 1/5 of peer election timeout
     peer-heartbeat-interval: 500
+  units:
+  - name: install-deisctl.service
+    command: start
+    content: |
+      [Unit]
+      Description=Install deisctl utility
+
+      [Service]
+      Type=oneshot
+      ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 2.22.1'
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=2.22.1
-  - path: /etc/profile.d/nse-function.sh
-    permissions: '0755'
-    content: |
-      function nse() {
-        sudo nsenter --pid --uts --mount --ipc --net --target $(docker inspect --format="{{ .State.Pid }}" $1)
-      }
+      DEIS_RELEASE=v2.22.1
+  - path: /etc/motd
 `
 
 var rst = `

docs/contributing/releases.rst

@@ -50,11 +50,13 @@ deis repo
     * ``git checkout master && git pull``
     * ``git tag vX.Y.Z``
     * ``git push --tags origin vX.Y.Z``
+- Trigger all deis-cli and deisctl builder jobs at ci.deis.io. When they finish, verify that
+  the current binary installers are publicly downloadable from the opdemand S3 bucket.
+- Trigger the test-master job, supplying vX.Y.Z as the version
+- When test-master completes, double-check images at Docker Hub to verify tags are published
 - Publish CLI to pypi.python.org
     - ``cd client && python setup.py sdist upload``
     - use testpypi.python.org first to ensure there aren't any problems
-- Continuous delivery jobs at ci.deis.io will update the deis CLI. Double-check that the
-  current binary installers are publicly downloadable from the opdemand S3 bucket.
 
 deis.io repo
 ------------