Merge pull request #954 from mikebrow/go-version-update

adds golang 1.11.x to build

.travis.yml

@@ -2,48 +2,48 @@ git:
   depth: 150
 
 language: go
+go:
+  - 1.11.x
+  - tip
+
+matrix:
+  allow_failures:
+    - go: tip
 
 sudo: required
 
 services:
-    - docker
+  - docker
 
 cache:
-    directories:
+  directories:
-        - "${HOME}/google-cloud-sdk/"
+    - "${HOME}/google-cloud-sdk/"
 
 before_install:
-    # libseccomp in trusty is not new enough, need backports version.
+  # libseccomp in trusty is not new enough, need backports version.
-    - sudo sh -c "echo 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' > /etc/apt/sources.list.d/backports.list"
+  - sudo sh -c "echo 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse' > /etc/apt/sources.list.d/backports.list"
-    - sudo apt-get update
+  - sudo apt-get update
 
 install:
-    - sudo apt-get install btrfs-tools
+  - sudo apt-get install btrfs-tools
-    - sudo apt-get install libseccomp2/trusty-backports
+  - sudo apt-get install libseccomp2/trusty-backports
-    - sudo apt-get install libseccomp-dev/trusty-backports
+  - sudo apt-get install libseccomp-dev/trusty-backports
-    - sudo apt-get install socat
+  - sudo apt-get install socat
 
 before_script:
-    - export PATH=$HOME/gopath/bin:$PATH
+  - export PATH=$HOME/gopath/bin:$PATH
 
-jobs:
+script:
-  include:
+  - make install.tools
-    - stage: Build
+  - make .gitvalidation
-      script:
+  - make binaries
-        - make install.tools
+  - make install.deps
-        - make .gitvalidation
+  - make containerd
-        - make binaries
+  - sudo PATH=$PATH GOPATH=$GOPATH make install-containerd
-      go: "1.10.x"
+  - make test
-    - stage: Test
+  - make test-integration
-      script:
+  - make test-cri
-        - make install.deps
+after_script:
-        - make containerd
+  # Abuse travis to preserve the log.
-        - sudo PATH=$PATH GOPATH=$GOPATH make install-containerd
+  - cat /tmp/test-integration/containerd.log
-        - make test
+  - cat /tmp/test-cri/containerd.log
-        - make test-integration
-        - make test-cri
-      after_script:
-        # Abuse travis to preserve the log.
-        - cat /tmp/test-integration/containerd.log
-        - cat /tmp/test-cri/containerd.log
-      go: "1.10.x"

integration/container_update_resources_test.go

@@ -51,7 +51,7 @@ func TestUpdateContainerResources(t *testing.T) {
 		"container",
 		pauseImage,
 		WithResources(&runtime.LinuxContainerResources{
-			MemoryLimitInBytes: 2 * 1024 * 1024,
+			MemoryLimitInBytes: 200 * 1024 * 1024,
 		}),
 	)
 	cn, err := runtimeService.CreateContainer(sb, cnConfig, sbConfig)
@@ -62,18 +62,18 @@ func TestUpdateContainerResources(t *testing.T) {
 	require.NoError(t, err)
 	spec, err := container.Spec(context.Background())
 	require.NoError(t, err)
-	checkMemoryLimit(t, spec, 2*1024*1024)
+	checkMemoryLimit(t, spec, 200*1024*1024)
 
 	t.Log("Update container memory limit after created")
 	err = runtimeService.UpdateContainerResources(cn, &runtime.LinuxContainerResources{
-		MemoryLimitInBytes: 4 * 1024 * 1024,
+		MemoryLimitInBytes: 400 * 1024 * 1024,
 	})
 	require.NoError(t, err)
 
 	t.Log("Check memory limit in container OCI spec")
 	spec, err = container.Spec(context.Background())
 	require.NoError(t, err)
-	checkMemoryLimit(t, spec, 4*1024*1024)
+	checkMemoryLimit(t, spec, 400*1024*1024)
 
 	t.Log("Start the container")
 	require.NoError(t, runtimeService.StartContainer(cn))
@@ -85,21 +85,21 @@ func TestUpdateContainerResources(t *testing.T) {
 	require.NoError(t, err)
 	stat, err := cgroup.Stat(cgroups.IgnoreNotExist)
 	require.NoError(t, err)
-	assert.Equal(t, uint64(4*1024*1024), stat.Memory.Usage.Limit)
+	assert.Equal(t, uint64(400*1024*1024), stat.Memory.Usage.Limit)
 
 	t.Log("Update container memory limit after started")
 	err = runtimeService.UpdateContainerResources(cn, &runtime.LinuxContainerResources{
-		MemoryLimitInBytes: 8 * 1024 * 1024,
+		MemoryLimitInBytes: 800 * 1024 * 1024,
 	})
 	require.NoError(t, err)
 
 	t.Log("Check memory limit in container OCI spec")
 	spec, err = container.Spec(context.Background())
 	require.NoError(t, err)
-	checkMemoryLimit(t, spec, 8*1024*1024)
+	checkMemoryLimit(t, spec, 800*1024*1024)
 
 	t.Log("Check memory limit in cgroup")
 	stat, err = cgroup.Stat(cgroups.IgnoreNotExist)
 	require.NoError(t, err)
-	assert.Equal(t, uint64(8*1024*1024), stat.Memory.Usage.Limit)
+	assert.Equal(t, uint64(800*1024*1024), stat.Memory.Usage.Limit)
 }