Merge pull request #672 from github/revert-node-version-check

revert node version check

Author: ashishkeshan

bin/ghe-host-check

@@ -41,22 +41,6 @@ done
 # $GHE_HOSTNAME configured in backup.config when not present.
 host="${1:-$GHE_HOSTNAME}"
 
-CLUSTER=false
-if ghe-ssh "$host" -- \
-  "[ -f '$GHE_REMOTE_ROOT_DIR/etc/github/cluster' ]"; then
-  CLUSTER=true
-fi
-
-if "$CLUSTER"; then
-  node_version_list=$(ghe-ssh "$host" ghe-cluster-each -- ghe-version)
-  echo "$node_version_list" 1>&2
-  distinct_versions=$(echo "$node_version_list" | awk '{split($0, a, ":"); print a[2]}' | uniq | wc -l)
-  if [ "$distinct_versions" -ne 1 ]; then
-    echo "Error: Not all nodes are running the same version! Please ensure all nodes are running the same version before using backup-utils." 1>&2
-    exit 1
-  fi
-fi
-
 # Options to pass to SSH during connection check
 options="
   -o PasswordAuthentication=no

test/bin/ghe-cluster-each

@@ -19,19 +19,6 @@ for _ in "$@"; do
   esac
 done
 
-if [ "$2" == "ghe-version" ]; then
-  if [ -z "$DIFFERENT_VERSIONS" ]; then
-    echo "fake-uuid: GitHub Enterprise Server 3.1.0 lxc 2020-12-16 5e97c07602"
-    echo "fake-uuid1: GitHub Enterprise Server 3.1.0 lxc 2020-12-16 5e97c07602"
-    echo "fake-uuid2: GitHub Enterprise Server 3.1.0 lxc 2020-12-16 5e97c07602"
-  else
-    echo "fake-uuid: GitHub Enterprise Server 3.1.0 lxc 2020-12-16 5e97c07602"
-    echo "fake-uuid1: GitHub Enterprise Server 3.1.0 lxc 2020-12-16 5e97c07602"
-    echo "fake-uuid2: GitHub Enterprise Server 2.19 lxc 2020-12-13 5e97c07622"
-  fi
-  exit 0
-fi
-
 if $SHOW_UUID; then
   CONFIG="$GHE_REMOTE_DATA_USER_DIR/common/cluster.conf"
 

test/test-ghe-restore.sh

@@ -535,7 +535,7 @@ setup_test_data "$GHE_DATA_DIR/1"
 # Make the current symlink
 ln -s 1 "$GHE_DATA_DIR/current"
 
-begin_test "ghe-restore cluster with matching node versions"
+begin_test "ghe-restore cluster"
 (
   set -e
   rm -rf "$GHE_REMOTE_ROOT_DIR"
@@ -598,32 +598,6 @@ begin_test "ghe-restore cluster with matching node versions"
 )
 end_test
 
-begin_test "ghe-restore cluster with different node versions should fail at ghe-host-check"
-(
-  set -e
-  rm -rf "$GHE_REMOTE_ROOT_DIR"
-  setup_moreutils_parallel
-  setup_remote_metadata
-  setup_remote_cluster
-  echo "cluster" > "$GHE_DATA_DIR/current/strategy"
-
-  # set that versions should not match for this test
-  DIFFERENT_VERSIONS=1
-  export DIFFERENT_VERSIONS
-
-  # set as configured, enable maintenance mode and create required directories
-  setup_maintenance_mode "configured"
-
-  # set restore host environ var
-  GHE_RESTORE_HOST=127.0.0.1
-  export GHE_RESTORE_HOST
-
-  ! output=$(ghe-restore -v -f 2>&1)
-
-  echo "$output" | grep -q "Error: Not all nodes are running the same version! Please ensure all nodes are running the same version before using backup-utils."
-)
-end_test
-
 begin_test "ghe-restore missing directories or files from source snapshot displays warning"
 (
     # Tests the scenario where something exists in the database, but not on disk.