Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Vagrant support from codebase #7521

Merged
merged 5 commits into from
Sep 2, 2019
Merged

Remove Vagrant support from codebase #7521

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aeea79b
Remove Vagrant support from codebase.
ulloaluis Aug 30, 2019
a801928
Update codeowners file for vagrant.
ulloaluis Aug 30, 2019
880662c
Remove generated file from commit.
ulloaluis Aug 30, 2019
aea2d11
Remove extra newline.
ulloaluis Sep 1, 2019
ea62ba7
Removing another Vagrant reference.
ulloaluis Sep 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
/tox.ini @kevinlee12
/scripts/ @kevinlee12
/ubuntu_dockerfile @ezl-13 @kevinlee12
/Vagrantfile @kevinlee12


# Exploration project.
Expand Down
38 changes: 0 additions & 38 deletions Vagrantfile
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions scripts/install_prerequisites.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions scripts/install_third_party.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@

from . import common

# These two lines prevent a "IOError: [Errno socket error]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the extra newline.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

# [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')
Expand Down
8 changes: 0 additions & 8 deletions scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions scripts/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
60 changes: 0 additions & 60 deletions scripts/vagrant_lock.sh
View file
Open in desktop

This file was deleted.