From 6d0e7a7b6a2a57e3b0218af3e4f5303ec74e176b Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Sun, 22 Apr 2018 16:26:28 +0200 Subject: [PATCH 1/3] Update kernel 4.14.34 and newer Docker tools --- .../spec/hypriotos-image/base/kernel_spec.rb | 6 +++--- .../spec/hypriotos-image/docker-compose_spec.rb | 2 +- .../test-integration/spec/hypriotos-image/docker_spec.rb | 8 ++++---- .../spec/hypriotos-image/kernel_config_spec.rb | 1 - versions.config | 8 ++++---- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb b/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb index ecf0843..38be3bb 100644 --- a/builder/test-integration/spec/hypriotos-image/base/kernel_spec.rb +++ b/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 diff --git a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb b/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb index 41234b6..e8f4276 100644 --- a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb +++ b/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 diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb index 018af40..bffbc36 100644 --- a/builder/test-integration/spec/hypriotos-image/docker_spec.rb +++ b/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-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 diff --git a/builder/test-integration/spec/hypriotos-image/kernel_config_spec.rb b/builder/test-integration/spec/hypriotos-image/kernel_config_spec.rb index de366a6..31aeabb 100644 --- a/builder/test-integration/spec/hypriotos-image/kernel_config_spec.rb +++ b/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: diff --git a/versions.config b/versions.config index 30f2aea..85929c9 100644 --- a/versions.config +++ b/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-0~raspbian" +export DOCKER_COMPOSE_VERSION="1.21.0" export DOCKER_MACHINE_VERSION="0.14.0" From 581f47989a38f359cde0cec6d1492771187f870d Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Sun, 22 Apr 2018 19:04:22 +0200 Subject: [PATCH 2/3] Fix docker version --- builder/test-integration/spec/hypriotos-image/docker_spec.rb | 2 +- versions.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb index bffbc36..49fcfd2 100644 --- a/builder/test-integration/spec/hypriotos-image/docker_spec.rb +++ b/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.04.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 diff --git a/versions.config b/versions.config index 85929c9..97b51a9 100644 --- a/versions.config +++ b/versions.config @@ -12,6 +12,6 @@ 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.14.34" -export DOCKER_CE_VERSION="18.04.0~ce-0~raspbian" +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" From 016a299c549abeda2a29396b087080bfc92b0dbf Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Sun, 22 Apr 2018 19:18:12 +0200 Subject: [PATCH 3/3] Fix docker version --- builder/test-integration/spec/hypriotos-image/docker_spec.rb | 2 +- versions.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb index 49fcfd2..b423bd7 100644 --- a/builder/test-integration/spec/hypriotos-image/docker_spec.rb +++ b/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.04.0~ce-3-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 diff --git a/versions.config b/versions.config index 97b51a9..9640b68 100644 --- a/versions.config +++ b/versions.config @@ -12,6 +12,6 @@ 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.14.34" -export DOCKER_CE_VERSION="18.04.0~ce-3-0~raspbian" +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"