Merge pull request #615 from github/add-middle-version

Remove loop of testing against older versions

Author: cainejette

script/cibuild

@@ -2,29 +2,12 @@
 # Usage: script/cibuild [--no-package]
 set -e
 
-# GHE appliance versions to run tests against. Remote metadata files are put in
-# place with this version at the beginning of each test and many commands have
-# conditional logic based on the remote version. Running the suite against
-# different major versions ensures we're covering these conditional paths.
-REMOTE_VERSIONS="2.19.0 2.21.0"
-
 # Enable verbose logging of ssh commands
 export GHE_VERBOSE_SSH=true
 
-# Run over all remote versions and run entire test suite against each
-res=true
-for version in $REMOTE_VERSIONS
-do
-  echo "==> Running testsuite with GHE_TEST_REMOTE_VERSION=$version"
-  export GHE_TEST_REMOTE_VERSION="$version"
-  if ! find test -name "test-*.sh" -print0 | xargs -0 -P 4 -n 1 /bin/bash; then
-    res=false
-  fi
-  echo
-done
-
-# If any of the version tests failed, exit non-zero
-$res
+if ! find test -name "test-*.sh" -print0 | xargs -0 -P 4 -n 1 /bin/bash; then
+  exit 1
+fi
 
 # Bail out when --no-package given
 [ "$1" = "--no-package" ] && exit 0

script/release

@@ -210,10 +210,6 @@ def bump_version(new_version, min_version = nil, path = 'share/github-backup-uti
     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 }
-
-    content = File.read('script/cibuild')
-    new_content = content.gsub(/^REMOTE_VERSIONS=.*$/, "REMOTE_VERSIONS=\"#{min_version} #{new_version}\"")
-    File.open('script/cibuild', 'w') {|file| file.puts new_content }
   end
 end