Skip to content

Commit f1b710f

Browse files
authored
Update dependencies to Mesos 1.8.1 (aurora-scheduler#46)
### 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
1 parent 3ee1f57 commit f1b710f

File tree

8 files changed

+252
-76
lines changed

8 files changed

+252
-76
lines changed

RELEASE-NOTES.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
0.24.0 (unreleased)
22
======
33

4+
### New/updated:
5+
- Updated to Mesos dependency to 1.8.1.
6+
- Pants version bumped up to 1.23.0.
7+
- Minimum Vagrant version bumped up to 2.2.9.
8+
49
0.23.0
510
======
611

Vagrantfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
1818
VAGRANTFILE_API_VERSION = "2"
1919

20-
Vagrant.require_version ">= 2.0.2"
20+
Vagrant.require_version ">= 2.2.9"
2121

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

2828
config.vm.define "devcluster" do |dev|
2929
dev.vm.network :private_network, ip: "192.168.33.7", :auto_config => false

build-support/packer/build.sh

+13-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set -o errexit
1717
set -o nounset
1818
set -o verbose
1919

20-
readonly MESOS_VERSION=1.7.2
20+
readonly MESOS_VERSION=1.8.1
2121

2222
function remove_unused {
2323
# The default bento/ubuntu-16.04 image includes juju-core, which adds ~300 MB to our image.
@@ -40,10 +40,16 @@ function install_base_packages {
4040
libsasl2-dev \
4141
libsvn-dev \
4242
openjdk-8-jdk-headless \
43-
python-dev
43+
software-properties-common
4444
update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
45-
# Installing zookeeperd as a separate command, as otherwise openjdk-7-jdk is also installed.
46-
apt-get install -y zookeeperd
45+
46+
# Add repo to control Python version
47+
add-apt-repository -y ppa:deadsnakes/ppa
48+
apt-get update
49+
50+
# Install python3.8 and also installing zookeeperd as a separate command,
51+
# as otherwise openjdk-7-jdk is also installed.
52+
apt-get install -y python3.8 python3.8-distutils python3.8-dev zookeeperd
4753
}
4854

4955
function install_docker {
@@ -63,7 +69,7 @@ function install_docker {
6369

6470
function install_docker2aci {
6571
DOCKER2ACI_VERSION="0.17.2"
66-
GOLANG_VERSION="1.14.3"
72+
GOLANG_VERSION="1.14.7"
6773

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

136142
chown -R vagrant:vagrant aurora

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ project(':api') {
215215

216216
task checkPython {
217217
doLast {
218-
def python3Executable = ['python3', 'python'].find { python ->
218+
def python3Executable = ['python3', 'python3.8', 'python'].find { python ->
219219
try {
220220
def check = "import sys; sys.exit(0 if sys.version_info >= (3,8) else 1)"
221221
return [python, "-c", check].execute().waitFor() == 0
@@ -391,7 +391,7 @@ dependencies {
391391
compile "org.apache.curator:curator-client:${curatorRev}"
392392
compile "org.apache.curator:curator-framework:${curatorRev}"
393393
compile "org.apache.curator:curator-recipes:${curatorRev}"
394-
compile 'org.apache.mesos:mesos:1.7.2'
394+
compile 'org.apache.mesos:mesos:1.8.1'
395395
compile "org.asynchttpclient:async-http-client:${asyncHttpclientRev}"
396396
compile "org.apache.shiro:shiro-guice:${shiroRev}"
397397
compile "org.apache.shiro:shiro-web:${shiroRev}"

docker-compose.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
ipv4_address: 192.168.33.2
1515

1616
master:
17-
image: aurorascheduler/mesos-master:1.7.2
17+
image: aurorascheduler/mesos-master:1.8.1
1818
restart: on-failure
1919
ports:
2020
- "5050:5050"
@@ -32,7 +32,7 @@ services:
3232
- zk
3333

3434
agent:
35-
image: aurorascheduler/mesos-agent:1.7.2
35+
image: aurorascheduler/mesos-agent:1.8.1
3636
pid: host
3737
restart: on-failure
3838
ports:
@@ -45,6 +45,7 @@ services:
4545
MESOS_RESOURCES: ports(*):[11000-11999]
4646
MESOS_SYSTEMD_ENABLE_SUPPORT: 'false'
4747
MESOS_WORK_DIR: /tmp/mesos
48+
MESOS_ATTRIBUTES: 'zone:east
4849
networks:
4950
aurora_cluster:
5051
ipv4_address: 192.168.33.5
@@ -67,6 +68,7 @@ services:
6768
MESOS_MASTER: "zk://192.168.33.2:2181/mesos"
6869
EXTRA_SCHEDULER_ARGS: >
6970
-http_authentication_mechanism=NONE
71+
-min_required_instances_for_sla_check=1
7072
volumes:
7173
- ./:/home/vagrant/aurora
7274
networks:

examples/vagrant/provision-dev-cluster.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ install_rsyslog_config
110110
start_services
111111
configure_netrc
112112
docker_setup
113-
su vagrant -c "aurorabuild all"
113+
su vagrant -c "aurorabuild scheduler"

0 commit comments

Comments
 (0)