Merge pull request #242 from hypriot/update-kernel-4.14.34

Update kernel 4.14.34 and newer Docker tools

builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe command('uname -r') do
-  its(:stdout) { should match /4.9.80(-v7)?+/ }
+  its(:stdout) { should match /4.14.34(-v7)?+/ }
   its(:exit_status) { should eq 0 }
 end
 
-describe file('/lib/modules/4.9.80-hypriotos+/kernel') do
+describe file('/lib/modules/4.14.34-hypriotos+/kernel') do
   it { should be_directory }
 end
 
-describe file('/lib/modules/4.9.80-hypriotos-v7+/kernel') do
+describe file('/lib/modules/4.14.34-hypriotos-v7+/kernel') do
   it { should be_directory }
 end

builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb

@@ -7,7 +7,7 @@
 end
 
 describe command('docker-compose --version') do
-  its(:stdout) { should match /1.20.1/m }
+  its(:stdout) { should match /1.21.0/m }
   its(:exit_status) { should eq 0 }
 end
 

builder/test-integration/spec/hypriotos-image/docker_spec.rb

@@ -10,7 +10,7 @@
 
 describe command('dpkg -l docker-ce') do
   its(:stdout) { should match /ii  docker-ce/ }
-  its(:stdout) { should match /18.03.0~ce-0~raspbian/ }
+  its(:stdout) { should match /18.04.0~ce~3-0~raspbian/ }
   its(:stdout) { should match /armhf/ }
   its(:exit_status) { should eq 0 }
 end
@@ -84,13 +84,13 @@
 end
 
 describe command('docker -v') do
-  its(:stdout) { should match /Docker version 18.03.0-ce, build/ }
+  its(:stdout) { should match /Docker version 18.04.0-ce, build/ }
   its(:exit_status) { should eq 0 }
 end
 
 describe command('docker version') do
-  its(:stdout) { should match /Client:. Version:	18.03.0-ce. API version:	1.37/m }
-  its(:stdout) { should match /Server:. Engine:.  Version:	18.03.0-ce.  API version:	1.37/m }
+  its(:stdout) { should match /Client:. Version:	18.04.0-ce. API version:	1.37/m }
+  its(:stdout) { should match /Server:. Engine:.  Version:	18.04.0-ce.  API version:	1.37/m }
   its(:exit_status) { should eq 0 }
 end
 

builder/test-integration/spec/hypriotos-image/kernel_config_spec.rb

@@ -7,7 +7,6 @@
   its(:stdout) { should match /CONFIG_FTRACE=y/ }
   its(:stdout) { should match /CONFIG_DYNAMIC_FTRACE=y/ }
   its(:stdout) { should match /CONFIG_HAVE_DYNAMIC_FTRACE=y/ }
-  its(:stdout) { should match /CONFIG_BCM2708_VCHIQ=y/ }
   its(:stdout) { should match /CONFIG_HW_RANDOM_BCM2835=y/ }
   # Docker specific kernel settings (see https://github.com/docker/docker/blob/master/contrib/check-config.sh)
   ## Generally Necessary:

versions.config

@@ -8,10 +8,10 @@ RAW_IMAGE_VERSION="v0.2.2"
 RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1c2c6"
 
 # specific versions of kernel/firmware and docker tools
-export KERNEL_BUILD="20180327-070923"
+export KERNEL_BUILD="20180422-141901"
 # For testing a new kernel, use the CircleCI artifacts URL.
 # export KERNEL_URL=https://62-32913687-gh.circle-artifacts.com/0/home/circleci/project/output/20180320-092128/raspberrypi-kernel_20180320-092128_armhf.deb
-export KERNEL_VERSION="4.9.80"
-export DOCKER_CE_VERSION="18.03.0~ce-0~raspbian"
-export DOCKER_COMPOSE_VERSION="1.20.1"
+export KERNEL_VERSION="4.14.34"
+export DOCKER_CE_VERSION="18.04.0~ce~3-0~raspbian"
+export DOCKER_COMPOSE_VERSION="1.21.0"
 export DOCKER_MACHINE_VERSION="0.14.0"