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

[dev] some updates for making Xenial default env #4213

Merged
merged 2 commits into from
Mar 5, 2019
Merged

[dev] some updates for making Xenial default env #4213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c03417
vagrantfile: use xenial throughout
redshiftzero Feb 27, 2019
f4c4ec4
dev: default BASE_OS is xenial in application makefile
redshiftzero Feb 28, 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
8 changes: 4 additions & 4 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Vagrant.configure("2") do |config|
config.ssh.port = 22
end
staging.vm.hostname = "mon-staging"
staging.vm.box = "bento/ubuntu-14.04"
staging.vm.box = "bento/ubuntu-16.04"
staging.vm.network "private_network", ip: "10.0.1.3"
staging.vm.synced_folder './', '/vagrant', disabled: true
end
Expand All @@ -38,7 +38,7 @@ Vagrant.configure("2") do |config|
config.ssh.port = 22
end
staging.vm.hostname = "app-staging"
staging.vm.box = "bento/ubuntu-14.04"
staging.vm.box = "bento/ubuntu-16.04"
staging.vm.network "private_network", ip: "10.0.1.2"
staging.vm.synced_folder './', '/vagrant', disabled: true
staging.vm.provider "virtualbox" do |v|
Expand Down Expand Up @@ -67,7 +67,7 @@ Vagrant.configure("2") do |config|
config.ssh.port = 22
end
prod.vm.hostname = "mon-prod"
prod.vm.box = "bento/ubuntu-14.04"
prod.vm.box = "bento/ubuntu-16.04"
prod.vm.network "private_network", ip: "10.0.1.5", virtualbox__intnet: internal_network_name
prod.vm.synced_folder './', '/vagrant', disabled: true
end
Expand All @@ -79,7 +79,7 @@ Vagrant.configure("2") do |config|
config.ssh.port = 22
end
prod.vm.hostname = "app-prod"
prod.vm.box = "bento/ubuntu-14.04"
prod.vm.box = "bento/ubuntu-16.04"
prod.vm.network "private_network", ip: "10.0.1.4", virtualbox__intnet: internal_network_name
prod.vm.synced_folder './', '/vagrant', disabled: true
prod.vm.provider "virtualbox" do |v|
Expand Down
10 changes: 5 additions & 5 deletions securedrop/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ lint-full: ## Run the python linter with nothing disabled
find . -name '*.py' | xargs pylint

.PHONY: test
test: ## Run the test suite in a Ubuntu 14.04 (Trusty) dockerized environment
test: ## Run the test suite in a Ubuntu 16.04 (Xenial) dockerized environment
./bin/dev-shell ./bin/run-test -v $${TESTFILES:-tests}

.PHONY: test-xenial
test-xenial: ## Run the test suite in a Ubuntu 16.04 (Xenial) dockerized environment
BASE_OS=xenial ./bin/dev-shell ./bin/run-test -v $${TESTFILES:-tests}
.PHONY: test-trusty
test-trusty: ## Run the test suite in a Ubuntu 14.04 (Trusty) dockerized environment (to be removed April 30, 2019)
BASE_OS=trusty ./bin/dev-shell ./bin/run-test -v $${TESTFILES:-tests}

.PHONY: translation-test
translation-test: ## Run all pages-layout tests in all supported languages
BASE_OS=xenial ./bin/dev-shell ./bin/translation-test $${TESTFILES:-tests/pageslayout}
./bin/dev-shell ./bin/translation-test $${TESTFILES:-tests/pageslayout}

.PHONY: dev
dev: ## Run the dev server
Expand Down
4 changes: 2 additions & 2 deletions securedrop/bin/dev-shell
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ TOPLEVEL=$(git rev-parse --show-toplevel)
source "${BASH_SOURCE%/*}/../../devops/scripts/ticker"

if ! test -n "${BASE_OS:-}" ; then
# If no base OS was specified, then we use Trusty
BASE_OS=trusty
# If no base OS was specified, then we use Xenial
BASE_OS=xenial
fi

function exit_if_not_supported_base_image() {
Expand Down