Remove Vagrant support from codebase (#7521)

oppia · Sep 2, 2019 · 8b28d42 · 8b28d42
1 parent 7121cd9
commit 8b28d42
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 125 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -29,8 +29,6 @@ AUTHORS      text eol=lf
 CHANGELOG    text eol=lf
 CONTRIBUTORS text eol=lf
 LICENSE      text eol=lf
-Vagrantfile  text eol=lf
-
 
 # Binary files
 # ============

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -99,7 +99,6 @@
 /tox.ini @kevinlee12
 /scripts/ @kevinlee12
 /ubuntu_dockerfile @ezl-13 @kevinlee12
-/Vagrantfile @kevinlee12
 
 
 # Exploration project.

diff --git a/Vagrantfile b/Vagrantfile
diff --git a/scripts/install_prerequisites.sh b/scripts/install_prerequisites.sh
@@ -25,11 +25,6 @@
 #
 # Note that the root folder MUST be named 'oppia'.
 
-if [ -e "/etc/is_vagrant_vm" ]
-then
-  source $(dirname $0)/vagrant_lock.sh || exit 1
-fi
-
 sudo apt-get update
 sudo apt-get install curl
 sudo apt-get install git

diff --git a/scripts/install_third_party.py b/scripts/install_third_party.py
@@ -27,12 +27,6 @@
 
 from . import common
 
-# These two lines prevent a "IOError: [Errno socket error]
-# [Errno -2] Name or service not known" error
-# in urllib.urlretrieve, if the user is behind a proxy.
-if 'VAGRANT' in os.environ:
-    os.environ['http_proxy'] = ''
-
 TOOLS_DIR = os.path.join('..', 'oppia_tools')
 THIRD_PARTY_DIR = os.path.join('.', 'third_party')
 THIRD_PARTY_STATIC_DIR = os.path.join(THIRD_PARTY_DIR, 'static')

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -178,14 +178,6 @@ fi
 # Adjust path to support the default Chrome locations for Unix, Windows and Mac OS.
 if [ "$TRAVIS" == true ]; then
   export CHROME_BIN="/usr/bin/chromium-browser"
-elif [ "$VAGRANT" == true ] || [ -f "/etc/is_vagrant_vm" ]; then
-  # XVFB is required for headless testing in Vagrant
-  sudo apt-get install xvfb chromium-browser
-  export CHROME_BIN="/usr/bin/chromium-browser"
-  # Used in frontend and e2e tests. Only gets set if using Vagrant VM.
-  export XVFB_PREFIX="/usr/bin/xvfb-run"
-  # Enforce proper ownership on oppia, oppia_tools, and node_modules or else NPM installs will fail.
-  sudo chown -R vagrant.vagrant /home/vagrant/oppia /home/vagrant/oppia_tools /home/vagrant/node_modules
 elif [ -f "/usr/bin/google-chrome" ]; then
   # Unix.
   export CHROME_BIN="/usr/bin/google-chrome"

diff --git a/scripts/start.sh b/scripts/start.sh
@@ -38,11 +38,6 @@ then
   exit 1
 fi
 
-if [ -e "/etc/is_vagrant_vm" ]
-then
-  source $(dirname $0)/vagrant_lock.sh || exit 1
-fi
-
 set -e
 source $(dirname $0)/setup.sh || exit 1
 source $(dirname $0)/setup_gae.sh || exit 1

diff --git a/scripts/vagrant_lock.sh b/scripts/vagrant_lock.sh