Skip to content
This repository has been archived by the owner on Apr 2, 2023. It is now read-only.

Commit

Permalink
Update dependencies to Mesos 1.8.1 (#46)
Browse files Browse the repository at this point in the history
### Description:
Upgrading dependencies to Mesos 1.8.1
Upgrading Pants version to 1.23.0
Added Python3.8 to Virtualbox through deadsnakes ppa
Bumped up minimum version of Vagrant to 2.2.9


### Testing Done:
Created Vagrant box
Did a vagrant up
  • Loading branch information
ridv authored Aug 21, 2020
1 parent 3ee1f57 commit f1b710f
Show file tree
Hide file tree
Showing 8 changed files with 252 additions and 76 deletions.
5 changes: 5 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
0.24.0 (unreleased)
======

### New/updated:
- Updated to Mesos dependency to 1.8.1.
- Pants version bumped up to 1.23.0.
- Minimum Vagrant version bumped up to 2.2.9.

0.23.0
======

Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"

Vagrant.require_version ">= 2.0.2"
Vagrant.require_version ">= 2.2.9"

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.hostname = "aurora.local"
# See build-support/packer/README.md for instructions on updating this box.
config.vm.box = "apache-aurora/dev-environment"
config.vm.box_version = "0.0.19"
config.vm.box_version = "0.0.20"

config.vm.define "devcluster" do |dev|
dev.vm.network :private_network, ip: "192.168.33.7", :auto_config => false
Expand Down
20 changes: 13 additions & 7 deletions build-support/packer/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set -o errexit
set -o nounset
set -o verbose

readonly MESOS_VERSION=1.7.2
readonly MESOS_VERSION=1.8.1

function remove_unused {
# The default bento/ubuntu-16.04 image includes juju-core, which adds ~300 MB to our image.
Expand All @@ -40,10 +40,16 @@ function install_base_packages {
libsasl2-dev \
libsvn-dev \
openjdk-8-jdk-headless \
python-dev
software-properties-common
update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
# Installing zookeeperd as a separate command, as otherwise openjdk-7-jdk is also installed.
apt-get install -y zookeeperd

# Add repo to control Python version
add-apt-repository -y ppa:deadsnakes/ppa
apt-get update

# Install python3.8 and also installing zookeeperd as a separate command,
# as otherwise openjdk-7-jdk is also installed.
apt-get install -y python3.8 python3.8-distutils python3.8-dev zookeeperd
}

function install_docker {
Expand All @@ -63,7 +69,7 @@ function install_docker {

function install_docker2aci {
DOCKER2ACI_VERSION="0.17.2"
GOLANG_VERSION="1.14.3"
GOLANG_VERSION="1.14.7"

TEMP_PATH=$(mktemp -d)
pushd "$TEMP_PATH"
Expand Down Expand Up @@ -127,10 +133,10 @@ function warm_artifact_cache {
# Fetch the mesos egg, needed to build python components.
# The mesos.executor target in 3rdparty/python/BUILD expects to find the native egg in
# third_party.
SVN_ROOT='https://svn.apache.org/repos/asf/aurora/3rdparty'
MESOS_PY_EGGS='https://dl.bintray.com/aurora-scheduler/python-eggs'
pushd "$THIRD_PARTY_DIR"
wget -c \
${SVN_ROOT}/ubuntu/xenial64/python/mesos.executor-${MESOS_VERSION}-py2.7-linux-x86_64.egg
${MESOS_PY_EGGS}/ubuntu/xenial64/mesos.executor-${MESOS_VERSION}-py2.7-linux-x86_64.egg
popd

chown -R vagrant:vagrant aurora
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ project(':api') {

task checkPython {
doLast {
def python3Executable = ['python3', 'python'].find { python ->
def python3Executable = ['python3', 'python3.8', 'python'].find { python ->
try {
def check = "import sys; sys.exit(0 if sys.version_info >= (3,8) else 1)"
return [python, "-c", check].execute().waitFor() == 0
Expand Down Expand Up @@ -391,7 +391,7 @@ dependencies {
compile "org.apache.curator:curator-client:${curatorRev}"
compile "org.apache.curator:curator-framework:${curatorRev}"
compile "org.apache.curator:curator-recipes:${curatorRev}"
compile 'org.apache.mesos:mesos:1.7.2'
compile 'org.apache.mesos:mesos:1.8.1'
compile "org.asynchttpclient:async-http-client:${asyncHttpclientRev}"
compile "org.apache.shiro:shiro-guice:${shiroRev}"
compile "org.apache.shiro:shiro-web:${shiroRev}"
Expand Down
6 changes: 4 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
ipv4_address: 192.168.33.2

master:
image: aurorascheduler/mesos-master:1.7.2
image: aurorascheduler/mesos-master:1.8.1
restart: on-failure
ports:
- "5050:5050"
Expand All @@ -32,7 +32,7 @@ services:
- zk

agent:
image: aurorascheduler/mesos-agent:1.7.2
image: aurorascheduler/mesos-agent:1.8.1
pid: host
restart: on-failure
ports:
Expand All @@ -45,6 +45,7 @@ services:
MESOS_RESOURCES: ports(*):[11000-11999]
MESOS_SYSTEMD_ENABLE_SUPPORT: 'false'
MESOS_WORK_DIR: /tmp/mesos
MESOS_ATTRIBUTES: 'zone:east
networks:
aurora_cluster:
ipv4_address: 192.168.33.5
Expand All @@ -67,6 +68,7 @@ services:
MESOS_MASTER: "zk://192.168.33.2:2181/mesos"
EXTRA_SCHEDULER_ARGS: >
-http_authentication_mechanism=NONE
-min_required_instances_for_sla_check=1
volumes:
- ./:/home/vagrant/aurora
networks:
Expand Down
2 changes: 1 addition & 1 deletion examples/vagrant/provision-dev-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ install_rsyslog_config
start_services
configure_netrc
docker_setup
su vagrant -c "aurorabuild all"
su vagrant -c "aurorabuild scheduler"
Loading

0 comments on commit f1b710f

Please sign in to comment.