From adcfe80f0940fd2f106ac818fa76d376297161b9 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 10 Nov 2020 15:33:21 +0400 Subject: [PATCH] remove Vagrantfile (#5641) we're no longer using it for development --- CONTRIBUTING.md | 14 ----------- Vagrantfile | 66 ------------------------------------------------- tests.mk | 7 +----- 3 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 Vagrantfile diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f29812af9..d4cbf86ae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -127,20 +127,6 @@ make install You should now be able to run `make proto-gen` from inside the root Tendermint directory to generate new files from proto files. -## Vagrant - -If you are a [Vagrant](https://www.vagrantup.com/) user, you can get started -hacking Tendermint with the commands below. - -NOTE: In case you installed Vagrant in 2017, you might need to run -`vagrant box update` to upgrade to the latest `ubuntu/xenial64`. - -```sh -vagrant up -vagrant ssh -make test -``` - ## Changelog Every fix, improvement, feature, or breaking change should be made in a diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 00e5c55c7..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,66 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - config.vm.box = "ubuntu/focal64" - - config.vm.provider "virtualbox" do |v| - v.memory = 4096 - v.cpus = 2 - end - - config.vm.provision "shell", inline: <<-SHELL - apt-get update - - # install base requirements - apt-get install -y --no-install-recommends wget curl jq zip \ - make shellcheck bsdmainutils psmisc - apt-get install -y language-pack-en - - # install docker - apt-get install -y --no-install-recommends apt-transport-https \ - ca-certificates \ - curl \ - gnupg-agent \ - software-properties-common - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - - add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) \ - stable" - apt-get update - apt-get install -y docker-ce - usermod -aG docker vagrant - - # install go - wget -q https://dl.google.com/go/go1.15.linux-amd64.tar.gz - tar -xvf go1.15.linux-amd64.tar.gz - mv go /usr/local - rm -f go1.15.linux-amd64.tar.gz - - # install nodejs (for docs) - curl -sL https://deb.nodesource.com/setup_11.x | bash - - apt-get install -y nodejs - - # cleanup - apt-get autoremove -y - - # set env variables - echo 'export GOROOT=/usr/local/go' >> /home/vagrant/.bash_profile - echo 'export GOPATH=/home/vagrant/go' >> /home/vagrant/.bash_profile - echo 'export PATH=$PATH:$GOROOT/bin:$GOPATH/bin' >> /home/vagrant/.bash_profile - echo 'export LC_ALL=en_US.UTF-8' >> /home/vagrant/.bash_profile - echo 'cd go/src/github.com/tendermint/tendermint' >> /home/vagrant/.bash_profile - - mkdir -p /home/vagrant/go/bin - mkdir -p /home/vagrant/go/src/github.com/tendermint - ln -s /vagrant /home/vagrant/go/src/github.com/tendermint/tendermint - - chown -R vagrant:vagrant /home/vagrant/go - chown vagrant:vagrant /home/vagrant/.bash_profile - - # get all deps and tools, ready to install/test - su - vagrant -c 'source /home/vagrant/.bash_profile' - su - vagrant -c 'cd /home/vagrant/go/src/github.com/tendermint/tendermint && make tools' - SHELL -end diff --git a/tests.mk b/tests.mk index e4431d935..77b29cfa0 100644 --- a/tests.mk +++ b/tests.mk @@ -52,11 +52,6 @@ test100: @for i in {1..100}; do make test; done .PHONY: test100 -vagrant_test: - vagrant up - vagrant ssh -c 'make test_integrations' -.PHONY: vagrant_test - ### go tests test: @echo "--> Running go test" @@ -70,5 +65,5 @@ test_race: test_deadlock: @echo "--> Running go test --deadlock" - @go test -p 1 -v $(PACKAGES) -tags deadlock + @go test -p 1 -v $(PACKAGES) -tags deadlock .PHONY: test_race