Merge branch 'master' into lildude/optimise-mysql-es-restores

Author: lildude

script/cibuild

@@ -7,8 +7,8 @@ set -e
 # conditional logic based on the remote version. Running the suite against
 # different major versions ensures we're covering these conditional paths.
 REMOTE_VERSIONS="
-  2.11.0
-  2.13.0
+  2.12.0
+  2.14.0
 "
 
 # Enable verbose logging of ssh commands

script/release

@@ -205,6 +205,10 @@ def bump_version(new_version, min_version = nil, path = 'share/github-backup-uti
     content = File.read('bin/ghe-host-check')
     new_content = content.gsub(/supported_minimum_version="[0-9]\.[0-9]+\.0"/, "supported_minimum_version=\"#{min_version}\"")
     File.open('bin/ghe-host-check', 'w') {|file| file.puts new_content }
+
+    content = File.read('test/testlib.sh')
+    new_content = content.gsub(/GHE_TEST_REMOTE_VERSION:=[0-9]\.[0-9]+\.0/,"GHE_TEST_REMOTE_VERSION:=#{new_version}")
+    File.open('test/testlib.sh', 'w') {|file| file.puts new_content }
   end
 end
 
@@ -384,6 +388,7 @@ if $PROGRAM_NAME == __FILE__
       puts `git diff --color`
       `git checkout -- share/github-backup-utils/version`
       `git checkout -- bin/ghe-host-check`
+      `git checkout -- test/testlib.sh`
       exit
     end
 

test/bin/ghe-es-remove-1x-indices

@@ -0,0 +1 @@
+ghe-fake-true

test/test-ghe-host-check.sh

@@ -52,14 +52,18 @@ end_test
 begin_test "ghe-host-check detects unsupported GitHub Enterprise versions"
 (
   set -e
+  # shellcheck disable=SC2046 # Word splitting is required to populate the variables
+  read -r bu_version_major bu_version_minor _ <<<$(ghe_parse_version $BACKUP_UTILS_VERSION)
+
   ! GHE_TEST_REMOTE_VERSION=11.340.36 ghe-host-check
-  ! GHE_TEST_REMOTE_VERSION=2.10.0 ghe-host-check
-  GHE_TEST_REMOTE_VERSION=2.11.0 ghe-host-check
-  GHE_TEST_REMOTE_VERSION=2.12.0 ghe-host-check
-  GHE_TEST_REMOTE_VERSION=2.13.999 ghe-host-check
-  GHE_TEST_REMOTE_VERSION=2.13.999gm1 ghe-host-check
+  ! GHE_TEST_REMOTE_VERSION=2.$((bu_version_minor-3)).0 ghe-host-check
+  GHE_TEST_REMOTE_VERSION=2.$((bu_version_minor-2)).0 ghe-host-check
+  GHE_TEST_REMOTE_VERSION=$BACKUP_UTILS_VERSION ghe-host-check
+  GHE_TEST_REMOTE_VERSION=$BACKUP_UTILS_VERSION ghe-host-check
+  GHE_TEST_REMOTE_VERSION=$bu_version_major.$bu_version_minor.999 ghe-host-check
+  GHE_TEST_REMOTE_VERSION=$bu_version_major.$bu_version_minor.999gm1 ghe-host-check
   ! GHE_TEST_REMOTE_VERSION=2.9999.1521793591.performancetest ghe-host-check
-  GHE_TEST_REMOTE_VERSION=3.0.0 ghe-host-check
+  GHE_TEST_REMOTE_VERSION=$((bu_version_major+1)).0.0 ghe-host-check
 )
 end_test