From fa4f952e34cc063517a71420184800a6f005a1a8 Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Sat, 23 Sep 2017 15:29:56 +0200 Subject: [PATCH 1/3] Update docker-compose version to 1.16.1 Signed-off-by: Dieter Reuter --- .../spec/hypriotos-image/docker-compose_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5c9de05..9f1d25d 100644 --- a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb @@ -11,6 +11,6 @@ end describe command('docker-compose --version') do - its(:stdout) { should match /1.14.0/m } + its(:stdout) { should match /1.16.1/m } its(:exit_status) { should eq 0 } end From abb1594972d107de9985f209bc609206df592cbc Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Sat, 23 Sep 2017 15:34:05 +0200 Subject: [PATCH 2/3] Test for console=serial0,115200 Signed-off-by: Dieter Reuter --- .../spec/hypriotos-image/cmdline_serial_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/test-integration/spec/hypriotos-image/cmdline_serial_spec.rb b/builder/test-integration/spec/hypriotos-image/cmdline_serial_spec.rb index fa15a41..78824a5 100644 --- a/builder/test-integration/spec/hypriotos-image/cmdline_serial_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/cmdline_serial_spec.rb @@ -3,6 +3,6 @@ it { should be_mode 755 } it { should be_owned_by 'root' } its(:content) { should match /console=tty1/ } - its(:content) { should match /console=ttyAMA0,115200/ } + its(:content) { should match /console=serial0,115200/ } its(:content) { should match /kgdboc=ttyAMA0,115200/ } end From 8cd8d1fd7cf62b0311ba505b6b552fc9cb61474e Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Sat, 23 Sep 2017 15:35:46 +0200 Subject: [PATCH 3/3] Update firmware version for brcmfmac driver Signed-off-by: Dieter Reuter --- .../spec/hypriotos-image/base/rpi3_wifi_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/test-integration/spec/hypriotos-image/base/rpi3_wifi_spec.rb b/builder/test-integration/spec/hypriotos-image/base/rpi3_wifi_spec.rb index 424f658..01d79c3 100644 --- a/builder/test-integration/spec/hypriotos-image/base/rpi3_wifi_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/base/rpi3_wifi_spec.rb @@ -9,8 +9,8 @@ describe command('ethtool -i wlan0') do its(:stdout) { should contain /driver: brcmfmac/ } - its(:stdout) { should contain /version: 7.45.41.26/ } - its(:stdout) { should contain /firmware-version: 01-df77e4a7/ } + its(:stdout) { should contain /version: 7.45.41.46/ } + its(:stdout) { should contain /firmware-version: 01-f8a78378/ } end end end