use 4.9.33-rancher-4.9.34rc-debian

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Dockerfile.dapper

@@ -61,7 +61,7 @@ ARG DOCKER_BUILD_VERSION=1.10.3
 ARG DOCKER_BUILD_PATCH_VERSION=v${DOCKER_BUILD_VERSION}-ros1
 ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29
 
-ARG KERNEL_VERSION_amd64=4.9.30-rancher
+ARG KERNEL_VERSION_amd64=4.9.33-rancher-4.9.34rc-debian
 ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/v${KERNEL_VERSION_amd64}/linux-${KERNEL_VERSION_amd64}-x86.tar.gz
 ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.4.0-arm64.8/linux-4.4.0-rancher-arm64.tar.gz
 
@@ -79,9 +79,9 @@ ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services
 ARG IMAGE_NAME=${OS_REPO}/os
 ARG DFS_IMAGE=${OS_REPO}/docker:v${DOCKER_VERSION}-2
 
-ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2017.02.3-1/os-base_amd64.tar.xz
-ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2017.02.3-1/os-base_arm64.tar.xz
-ARG OS_BASE_URL_arm=https://github.com/rancher/os-base/releases/download/v2017.02.3-1/os-base_arm.tar.xz
+ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2017.02.3-glibc-ssp-all/os-base_amd64.tar.xz
+ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2017.02.3-glibc-ssp-all/os-base_arm64.tar.xz
+ARG OS_BASE_URL_arm=https://github.com/rancher/os-base/releases/download/v2017.02.3-glibc-ssp-all/os-base_arm.tar.xz
 ######################################################
 
 # Set up environment and export all ARGS as ENV

tests/cmdline_test.go

@@ -1,7 +1,11 @@
 package integration
 
-import . "gopkg.in/check.v1"
-import "fmt"
+import (
+	. "gopkg.in/check.v1"
+
+	"fmt"
+	"strings"
+)
 
 func (s *QemuSuite) TestElideCmdLine(c *C) {
 	extra := "cc.hostname=nope rancher.password=three"
@@ -15,11 +19,10 @@ func (s *QemuSuite) TestElideCmdLine(c *C) {
 	s.RunQemuWith(c, runArgs...)
 
 	s.CheckOutput(c, "nope\n", Equals, "hostname")
-	s.CheckOutput(c,
-		"printk.devkmsg=on rancher.debug=true rancher.password=rancher console=ttyS0 rancher.autologin=ttyS0  cc.something=yes rancher.password=two rancher.state.dev=LABEL=RANCHER_STATE rancher.state.autoformat=[/dev/sda,/dev/vda] rancher.rm_usr -- \n",
-		Equals,
-		"cat /proc/cmdline",
-	)
+	cmdline := s.CheckOutput(c, "", Not(Equals), "cat /proc/cmdline",)
+	if strings.Contains(cmdline, extra) {
+		c.Errorf("/proc/cmdline (%s) contains info that should be elided (%s)", cmdline, extra)
+	}
 	s.CheckOutput(c,
 		fmt.Sprintf("/init %s\n", extra),
 		Equals,